Révision 2839

tmp/org.txm.setups/shared/debian/usr/bin/TXM (revision 2839)
1
# This script launches TXM in the right directory and with the right TXM.ini file
1
# This script launches TXM in the right directory and with the right launcher.ini file
2 2
UBUNTU_MENUPROXY=0
3 3
VERSION=-TXMVERSION
4 4
VERSIONWITHOUTSUB=-TXMVERSIONWITHOUTSUB
......
122 122
		exit 1
123 123
    fi
124 124

  
125
    echo "TXM: getting '$TXMINSTALL/TXM.ini' and setting write permissions to '$DOTTXMHOME/TXM.ini'"
126
    cp "$TXMINSTALL/TXM.ini" "$DOTTXMHOME/TXM.ini" &&
127
    chmod +w "$DOTTXMHOME/TXM.ini"
125
    echo "TXM: getting '$TXMINSTALL/launcher.ini' and setting write permissions to '$DOTTXMHOME/launcher.ini'"
126
    cp "$TXMINSTALL/launcher.ini" "$DOTTXMHOME/launcher.ini" &&
127
    chmod +w "$DOTTXMHOME/launcher.ini"
128 128
	
129 129
    if [ $? != 0 ]; then
130
        zenity --info --text="TXM: Can't launch TXM: failed to set TXM.ini file$LOGFILESMSG"
131
        echo "TXM: Can't launch TXM: failed to set TXM.ini file$LOGFILESMSG"
130
        zenity --info --text="TXM: Can't launch TXM: failed to set launcher.ini file$LOGFILESMSG"
131
        echo "TXM: Can't launch TXM: failed to set launcher.ini file$LOGFILESMSG"
132 132
        exit 1
133 133
    fi
134 134

  
......
156 156
#DEBUGOPTIONS="-log -clean -debug -console -noexit"
157 157
) 1>&3 2>&4
158 158

  
159
SWT_GTK3=0 UBUNTU_MENUPROXY=0 exec "${TXMINSTALL}/launcher" "$@" -run --launcher.ini "$DOTTXMHOME/TXM.ini" $DEBUGOPTIONS -configuration "$DOTTXMHOME/configuration" -user "$DOTTXMHOME/user" -install "$TXMINSTALL"
159
SWT_GTK3=0 UBUNTU_MENUPROXY=0 exec "${TXMINSTALL}/launcher" "$@" -run --launcher.ini "$DOTTXMHOME/launcher.ini" $DEBUGOPTIONS -configuration "$DOTTXMHOME/configuration" -user "$DOTTXMHOME/user" -install "$TXMINSTALL"
tmp/org.txm.setups/shared/win/TXM.bat (revision 2839)
56 56
mkdir "%DOTTXM%" 
57 57
IF errorlevel 1 (echo "TXM: failed to create %DOTTXM% directory.")
58 58

  
59
copy "%installdir%TXM.ini" "%DOTTXM%TXM.ini" 
60
IF errorlevel 1 (echo "TXM: failed to copy %DOTTXM%TXM.ini file")
59
copy "%installdir%launcher.ini" "%DOTTXM%launcher.ini" 
60
IF errorlevel 1 (echo "TXM: failed to copy %DOTTXM%launcher.ini file")
61 61

  
62 62
copy "%temp%\org.txm.rcpapplication.prefs" "%DOTTXM%org.txm.rcpapplication.prefs" 
63 63

  
......
77 77
:run
78 78
(
79 79
set _JAVA_OPTIONS=-Duser.home="%USERHOME%"
80
echo running "%installdir%launcher.exe" -run --launcher.ini "%DOTTXM%TXM.ini" %ARGS% -data "%DOTTXM%data" -user "%DOTTXM%user" -install "%installdir%"
81
REM "%installdir%launcher.exe" -run --launcher.ini "%DOTTXM%TXM.ini" %ARGS% -user "%DOTTXM%user" -install "%installdir%"
80
echo running "%installdir%launcher.exe" -run --launcher.ini "%DOTTXM%launcher.ini" %ARGS% -data "%DOTTXM%data" -user "%DOTTXM%user" -install "%installdir%"
81
REM "%installdir%launcher.exe" -run --launcher.ini "%DOTTXM%launcher.ini" %ARGS% -user "%DOTTXM%user" -install "%installdir%"
82 82
) >"%USERHOME%\TXMPostInstallOutputLogs.txt" 2>"%USERHOME%\TXMPostInstallErrorLogs.txt"
83 83

  
84
"%installdir%launcher.exe" -run --launcher.ini "%DOTTXM%TXM.ini" %ARGS% -configuration "%DOTTXM%configuration" -user "%DOTTXM%user" -install "%installdir%\"
84
"%installdir%launcher.exe" -run --launcher.ini "%DOTTXM%launcher.ini" %ARGS% -configuration "%DOTTXM%configuration" -user "%DOTTXM%user" -install "%installdir%\"
tmp/org.txm.setups/shared/win/txm.nsi (revision 2839)
257 257
File TXM.bat
258 258
File launcher.exe
259 259
File TXM.ico
260
File TXM.ini
260
File launcher.ini
261 261
File "TXM debug.bat"
262 262
File uninstall.ico
263 263
	
tmp/org.txm.setups/shared/mac/Applications/TXM.app/Contents/MacOS/TXM (revision 2839)
1 1
#!/bin/sh
2
# This script launch TXM in the right directory and with the right TXM.ini file
2
# This script launch TXM in the right directory and with the right launcher.ini file
3 3

  
4 4
echo "Preparing redirections in $HOME/TXMPostInstallOutputLogs.txt and $HOME/TXMPostInstallErrorLogs.txt files"
5 5

  
......
103 103
	    exit 1 ;
104 104
	fi
105 105

  
106
    echo "TXM: getting '/Applications/TXM-TXMVERSION.app/TXM.ini' and set write permission of '$DOTTXMHOME/TXM.ini'"
107
    cp "/Applications/TXM-TXMVERSION.app/Contents/TXM/TXM.ini" "$DOTTXMHOME/TXM.ini" &&
108
    chmod +w "$DOTTXMHOME/TXM.ini";
106
    echo "TXM: getting '/Applications/TXM-TXMVERSION.app/launcher.ini' and set write permission of '$DOTTXMHOME/launcher.ini'"
107
    cp "/Applications/TXM-TXMVERSION.app/Contents/TXM/launcher.ini" "$DOTTXMHOME/launcher.ini" &&
108
    chmod +w "$DOTTXMHOME/launcher.ini";
109 109
    
110 110
    if [ $? != 0 ]; then
111
       	echo "TXM: Can't launch TXM: failed to copy TXM.ini file$LOGFILESMSG"
111
       	echo "TXM: Can't launch TXM: failed to copy launcher.ini file$LOGFILESMSG"
112 112
        exit 1
113 113
    fi
114 114

  
......
142 142
	if [ $i == "-vmargs" ]; then
143 143
 	   STARTVMARGS=1
144 144
	fi
145
done < "$DOTTXMHOME/TXM.ini"; 
145
done < "$DOTTXMHOME/launcher.ini"; 
146 146

  
147 147
echo "TXM INI ARGS = $TXMINIARGS"
148 148
echo "TXM INI VM ARGS = $TXMINIARGSVM"
......
152 152
echo "TXM: Running TXM for Mac OS X $OSVERSION with the JAR launcher..."
153 153
) 1>&3 2>&4
154 154

  
155
echo "Starting TXM with --launcher.ini '$DOTTXMHOME/TXM.ini' -configuration '$DOTTXMHOME/configuration' -user '$DOTTXMHOME/user' -install '/Applications/TXM-TXMVERSION.app/Contents/TXM'" 
156
/Applications/TXM-TXMVERSION.app/Contents/TXM/jre/Contents/Home/bin/java -Djava.library.path="$(echo  /Applications/TXM-TXMVERSION.app/Contents/TXM/plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64_*/eclipse_*.so)" -XX:MaxPermSize=256m -XstartOnFirstThread $TXMINIARGSVM -jar "$(echo /Applications/TXM-TXMVERSION.app/Contents/TXM/plugins/org.eclipse.equinox.launcher_*.jar)" -os macosx -ws cocoa -arch x86_64 -showsplash -run --launcher.ini "$DOTTXMHOME/TXM.ini" -configuration "$DOTTXMHOME/configuration" -user "$DOTTXMHOME/user" -install "/Applications/TXM-TXMVERSION.app/Contents/TXM"
155
echo "Starting TXM with --launcher.ini '$DOTTXMHOME/launcher.ini' -configuration '$DOTTXMHOME/configuration' -user '$DOTTXMHOME/user' -install '/Applications/TXM-TXMVERSION.app/Contents/TXM'" 
156
/Applications/TXM-TXMVERSION.app/Contents/TXM/jre/Contents/Home/bin/java -Djava.library.path="$(echo  /Applications/TXM-TXMVERSION.app/Contents/TXM/plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64_*/eclipse_*.so)" -XX:MaxPermSize=256m -XstartOnFirstThread $TXMINIARGSVM -jar "$(echo /Applications/TXM-TXMVERSION.app/Contents/TXM/plugins/org.eclipse.equinox.launcher_*.jar)" -os macosx -ws cocoa -arch x86_64 -showsplash -run --launcher.ini "$DOTTXMHOME/launcher.ini" -configuration "$DOTTXMHOME/configuration" -user "$DOTTXMHOME/user" -install "/Applications/TXM-TXMVERSION.app/Contents/TXM"
tmp/org.txm.setups/BuildMacOSXIntel.sh (revision 2839)
43 43
	exit 1;
44 44
fi
45 45

  
46
echo " rename TXM's launcher.ini"
47
if [ ! -f  "exportRCP/macosx.cocoa.x86_64/Contents/TXM/TXM.ini" ]; then
48
	mv "exportRCP/macosx.cocoa.x86_64/Contents/TXM/launcher.ini" "exportRCP/macosx.cocoa.x86_64/Contents/TXM/TXM.ini"
49
	if [ $? != 0 ]; then
50
		echo "** MacOSXIntel.sh : failed to rename launcher.ini file"
51
		exit 1;
52
	fi
53
fi
54

  
55 46
echo " copy eclipse arch dependent build"
56 47
rsync -r  --exclude '.svn' "exportRCP/macosx.cocoa.x86_64/"* "TXM_${fullversion}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents"
57 48
if [ $? != 0 ]; then
tmp/org.txm.setups/BuildWin64bit.sh (revision 2839)
77 77
find "$APP/txm.nsi" -type f -exec sed -i "s/TXMVERSION/${FULLVERSION}/g" {} \;
78 78
find "$APP/TXM.bat" -type f -exec sed -i "s/TXMVERSION/${VERSION}/g" {} \;
79 79

  
80
#rename launcher.ini file to TXM.ini (more readable)
81
mv "$APP/launcher.ini" "$APP/TXM.ini"
82

  
83

  
84 80
echo "build executable"
85 81
wine nsis/makensis.exe -V1 ${APP}/txm.nsi 2> logs64
86 82

  
tmp/org.txm.setups/BuildLinux64bit.sh (revision 2839)
70 70
find "$APP/usr/bin/TXM" -type f -exec sed -i "s/TXMVERSION/$VERSION/g" {} \;
71 71
find "$APP/DEBIAN/control" -type f -exec sed -i "s/TXMVERSION/${VERSION}/g" {} \;
72 72

  
73
mv "$APP/usr/lib/TXM/launcher.ini" "$APP/usr/lib/TXM/TXM.ini"
74 73
mv "$APP/usr/bin/TXM" "$APP/usr/bin/TXM-$VERSION"
75 74
mv "$APP/usr/lib/TXM" "$APP/usr/lib/TXM-$VERSION"
76 75

  
77

  
78 76
find "$APP/usr/share/applications/TXM.desktop" -type f -exec sed -i "s/TXMVERSION/$VERSION/g" {} \;
79 77
find "$APP/usr/share/applications/TXM.desktop" -type f -exec sed -i "s/TXMVERSION/$VERSION/g" {} \;
80 78
find "$APP/usr/share/applications/TXM debug.desktop" -type f -exec sed -i "s/TXMVERSION/$VERSION/g" {} \;

Formats disponibles : Unified diff