Révision 730

tmp/org.txm.statsengine.r.feature/feature.xml (revision 730)
35 35
      <import plugin="org.txm.concordance.core" version="1.0.0" match="greaterOrEqual"/>
36 36
      <import plugin="org.txm.lexicaltable.core" version="1.0.0" match="greaterOrEqual"/>
37 37
      <import plugin="org.txm.ca.core" version="1.0.0" match="greaterOrEqual"/>
38
      <import plugin="org.txm.lexicon.core" version="1.0.0" match="greaterOrEqual"/>
39 38
      <import plugin="org.txm.specificities.core" version="1.0.0" match="greaterOrEqual"/>
40 39
      <import plugin="org.txm.progression.core" version="1.0.0" match="greaterOrEqual"/>
41 40
      <import plugin="org.txm.ahc.core" version="1.0.0" match="greaterOrEqual"/>
tmp/org.txm.groovy.core/src/groovy/org/txm/setup/BuildSplashVersion.groovy (revision 730)
13 13

  
14 14
int img_width = 316;
15 15

  
16
File rcpDir = new File(System.getProperty("user.home"), "workspace442/org.txm.rcp")
17
File product = new File(rcpDir, "rcp.product");
16
File rcpDir = new File(System.getProperty("user.home"), "workspace079/org.txm.rcp")
17
File product = new File(rcpDir, "rcpapplication.product");
18 18
File imgFile = new File(rcpDir, "splash_sansversion.bmp");
19 19
File imgFile2 = new File(rcpDir,"splash.bmp");
20 20

  
tmp/trunk/org.txm.setups/BuildLinux64bit.sh (revision 730)
64 64
	exit 1;
65 65
fi
66 66

  
67
# update po files
68
echo "update po files"
69
cd "$APP/DEBIAN"
70
debconf-updatepo
71
cd "../.."
67
# for multi installation: set the package version to txm-$VERSION
68
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/lib\/TXM/\/usr\/lib\/TXM_$VERSION/g" {} \;
69
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/bin\/TXM/\/usr\/bin\/TXM_$VERSION/g" {} \;
70
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/TXM/\/usr\/share\/TXM_$VERSION/g" {} \;
71
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/applications\/TXM.desktop/\/usr\/share\/applications\/TXM_$VERSION.desktop/g" {} \;
72
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/applications\/TXM debug.desktop/\/usr\/share\/applications\/TXM_$VERSION debug.desktop/g" {} \;
73
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/doc/\txm/\/usr\/share\/doc/\txm-$VERSION/g" {} \;
74
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/lintiant/overrides/\txm/\/usr\/share\/lintiant/overrides/\txm-$VERSION/g" {} \;
75
find "$APP/DEBIAN/postinst" -type f -exec sed -i "s/\/usr\/lib\/TXM/\/usr\/lib\/TXM_$VERSION/g" {} \;
76
find "$APP/DEBIAN/postinst" -type f -exec sed -i "s/TXM\&/TXM-{VERSION}\&/g" {} \;
77
find "$APP/DEBIAN/control" -type f -exec sed -i "s/Package: txm/Package: txm-${VERSION}/g" {} \;
78
find "$APP/usr/bin/TXM" -type f -exec sed -i "s/\/usr\/lib\/TXM/\/usr\/lib\/TXM_$VERSION/g" {} \;
79
find "$APP/usr/bin/TXM" -type f -exec sed -i "s/\$HOME\/TXM/\$HOME\/TXM_$VERSION/g" {} \;
80
mv "$APP/usr/bin/TXM" "$APP/usr/bin/TXM_$VERSION"
81
mv "$APP/usr/lib/TXM" "$APP/usr/lib/TXM_$VERSION"
82
find "$APP/usr/share/applications/TXM.desktop" -type f -exec sed -i "s/\/usr\/share\/TXM/\/usr\/share\/TXM_$VERSION/g" {} \;
83
find "$APP/usr/share/applications/TXM.desktop" -type f -exec sed -i "s/\/usr\/bin\/TXM/\/usr\/bin\/TXM_$VERSION/g" {} \;
84
find "$APP/usr/share/applications/TXM debug.desktop" -type f -exec sed -i "s/\/usr\/share\/TXM/\/usr\/share\/TXM_$VERSION/g" {} \;
85
find "$APP/usr/share/applications/TXM debug.desktop" -type f -exec sed -i "s/\/usr\/bin\/TXM/\/usr\/bin\/TXM_$VERSION/g" {} \;
86
mv "$APP/usr/share/applications/TXM.desktop" "$APP/usr/share/applications/TXM_$VERSION.desktop"
87
mv "$APP/usr/share/applications/TXM debug.desktop" "$APP/usr/share/applications/TXM_$VERSION debug.desktop"
88
mv "$APP/usr/share/doc/txm" "$APP/usr/share/doc/txm-$VERSION"
89
find "$APP/usr/share/lintian/overrides/txm" -type f -exec sed -i "s/txm binary/txm-$VERSION binary/g" {} \;
90
mv "$APP/usr/share/lintian/overrides/txm" "$APP/usr/share/lintian/overrides/txm-$VERSION"
91
mv "$APP/usr/share/TXM" "$APP/usr/share/TXM_$VERSION"
72 92

  
73 93
# build
74 94
sudo fakeroot dpkg-deb --build "$APP"
tmp/trunk/org.txm.setups/shared/debian/DEBIAN/postinst (revision 730)
15 15
fi
16 16

  
17 17
# set 'txm' group to TXM install files
18
sudo chgrp -R txm /usr/lib/TXM
18
sudo chgrp -R txm $TXMINSTALLDIR
19 19
if [ $? != 0 ]; then
20 20
	echo "** TXM install: failed to set the 'txm' group to TXM install files" >&2
21 21
	exit 1;
tmp/trunk/org.txm.setups/shared/debian/DEBIAN/preinst (revision 730)
1 1
#!/bin/bash
2
TXMINSTALLDIR="/usr/lib/TXM"
3 2

  
4
rm -rf "$TXMINSTALLDIR"
3
rm -rf "/usr/lib/TXM"
4
rm -rf "/usr/share/doc/txm"
5
rm -rf "/usr/share/lintian/overrides/txm"
6
rm -rf "/usr/share/TXM"
7
rm "/usr/share/applications/TXM.desktop"
8
rm "/usr/share/applications/TXM debug.desktop"
9
rm "/usr/bin/TXM"
10

  
11

  
tmp/trunk/org.txm.setups/shared/debian/usr/bin/TXM (revision 730)
1 1
# This script launches TXM in the right directory and with the right TXM.ini file
2 2
UBUNTU_MENUPROXY=0
3 3

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

  
6
LOGFILESMSG=", see $HOME/TXMPostInstallOutputLogs.txt and $HOME/TXMPostInstallErrorLogs.txt output and error messages files."
6
LOGFILESMSG=", see $HOME/TXM_PostInstallOutputLogs.txt and $HOME/TXM_PostInstallErrorLogs.txt output and error messages files."
7 7

  
8
exec 3>$HOME/TXMPostInstallOutputLogs.txt
9
exec 4>$HOME/TXMPostInstallErrorLogs.txt
8
exec 3>$HOME/TXM_PostInstallOutputLogs.txt
9
exec 4>$HOME/TXM_PostInstallErrorLogs.txt
10 10

  
11 11
(
12 12
echo "TXM: $HOME is '$HOME'"
tmp/org.txm.rcp.feature/feature.xml (revision 730)
193 193
      <import plugin="org.eclipse.e4.ui.workbench3" version="0.12.0" match="greaterOrEqual"/>
194 194
      <import plugin="org.eclipse.e4.ui.workbench.addons.swt" version="0.10.0" match="greaterOrEqual"/>
195 195
      <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
196
      <import plugin="com.ibm.icu"/>
197
      <import plugin="javax.annotation"/>
198
      <import plugin="javax.inject"/>
199
      <import plugin="org.eclipse.e4.core.commands"/>
200
      <import plugin="org.eclipse.e4.ui.services"/>
201
      <import plugin="org.eclipse.emf.common"/>
202
      <import plugin="javax.xml"/>
203 196
      <import plugin="org.txm.ca.core"/>
204 197
      <import plugin="org.eclipse.jdt.core"/>
205 198
      <import plugin="org.eclipse.jdt.ui"/>
......
207 200
      <import plugin="org.eclipse.jdt.debug"/>
208 201
      <import plugin="org.eclipse.jdt.launching"/>
209 202
      <import plugin="org.eclipse.jdt.debug.ui"/>
210
      <import plugin="org.codehaus.groovy" version="1.8.6" match="greaterOrEqual"/>
211
      <import plugin="org.eclipse.jdt.groovy.core" version="1.0.0" match="greaterOrEqual"/>
212
      <import plugin="org.eclipse.jdt.junit" version="3.4.0" match="greaterOrEqual"/>
213 203
      <import plugin="org.eclipse.ltk.core.refactoring" version="3.5.0" match="greaterOrEqual"/>
214 204
      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.4.100" match="greaterOrEqual"/>
215
      <import plugin="org.codehaus.groovy.eclipse.refactoring" version="2.9.0" match="greaterOrEqual"/>
216
      <import plugin="org.codehaus.groovy.eclipse.codebrowsing" version="2.9.0" match="greaterOrEqual"/>
217 205
      <import plugin="org.eclipse.jdt.core.manipulation" version="1.3.0" match="greaterOrEqual"/>
218 206
      <import plugin="org.eclipse.ui.views"/>
219 207
      <import plugin="org.eclipse.core.variables"/>
220 208
      <import plugin="org.eclipse.search" version="3.6.0" match="greaterOrEqual"/>
221
      <import plugin="org.codehaus.groovy.eclipse.compilerResolver" version="2.9.0" match="greaterOrEqual"/>
222 209
   </requires>
223 210

  
224 211
   <plugin
......
561 548
         version="0.0.0"
562 549
         unpack="false"/>
563 550

  
564
   <plugin
565
         id="org.codehaus.groovy.eclipse.ui"
566
         download-size="0"
567
         install-size="0"
568
         version="0.0.0"
569
         unpack="false"/>
570

  
571 551
</feature>
tmp/org.txm.rcp/rcpapplication.product (revision 730)
67 67
      startupProgressRect="13,332,290,15"
68 68
      startupMessageRect="13,312,290,20"
69 69
      startupForegroundColor="000000" />
70
   <launcher name=".main">
70
   <launcher name="TXM">
71 71
      <linux icon="/org.txm.rcp/icons/logo/TXM logo.xpm"/>
72 72
      <macosx icon="/org.txm.rcp/icons/logo/TXM logo.icns"/>
73 73
      <solaris/>
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 730)
85 85
import org.osgi.framework.BundleContext;
86 86
import org.osgi.framework.FrameworkUtil;
87 87
import org.osgi.framework.ServiceReference;
88
import org.osgi.framework.Version;
88 89
import org.txm.Toolbox;
89 90
import org.txm.core.preferences.TBXPreferences;
90 91
import org.txm.core.preferences.TXMPreferences;
......
103 104
import org.txm.rcp.preferences.RCPPreferences;
104 105
import org.txm.rcp.swt.dialog.CGUMessageDialog;
105 106
import org.txm.rcp.utils.JobHandler;
107
import org.txm.utils.BundleUtils;
106 108
import org.txm.utils.DeleteDir;
107 109
import org.txm.utils.io.FileCopy;
108 110
import org.txm.utils.io.IOUtils;
......
713 715

  
714 716
				Log.info("Checking TXM user directory.");
715 717
				if (TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE).trim().isEmpty()) {
716
					txmhomedir = new File(System.getProperty("user.home"), "TXM"); //$NON-NLS-1$ //$NON-NLS-2$
718
					Version v = BundleUtils.getBundleVersion("org.txm.rcp");
719
					
720
					String version = v.getMajor()+"_"+v.getMinor()+"_"+v.getMicro();
721
					if ("qualifier".equals(v.getQualifier())) {
722
						System.out.println("RUNNING TXM FROM ECLIPSE - GOD MODE ACTIVATED");
723
						version = "dev";
724
					}
725
					txmhomedir = new File(System.getProperty("user.home"), "TXM_"+version); //$NON-NLS-1$ //$NON-NLS-2$
717 726
				} else {
718 727
					txmhomedir = new File(TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE).trim());
719 728
				}

Formats disponibles : Unified diff