Revision 1214

tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/InstallGroovyFiles.java (revision 1214)
67 67
//		BundleUtils.copyFiles(bundle_id, "src/", "groovy/org/txm", "tal/", samplesDirectory);
68 68
		
69 69
		String bundle_id = "org.txm.groovy.core";
70
		BundleUtils.copyFiles(bundle_id, "src/", "groovy", "", userDirectory);
70
		BundleUtils.copyFiles(bundle_id, "", "src/groovy", "", userDirectory);
71 71
		
72 72
		bundle_id = "org.txm.core";
73 73
		File scriptsPackageDirectory = new File(userDirectory, "org/txm/scripts/importer");
tmp/org.txm.groovy.core/build.properties (revision 1214)
1 1
#Fri Jul 06 10:25:10 CEST 2018
2
bin.includes=META-INF/,.,bin/,plugin.xml,src/groovy/org/,src/groovy/tests/,src/groovy/filters/
2
bin.includes = META-INF/,\
3
               .,\
4
               bin/,\
5
               plugin.xml,\
6
               src/groovy/org/,\
7
               src/groovy/tests/,\
8
               src/groovy/filters/,\
9
               groovy/
3 10
output..=bin/
4 11
jars.compile.order=.
5 12
source..=src/java/
tmp/org.eclipse.pde.hack/src/org/eclipse/pde/internal/build/site/QualifierReplacer.java (revision 1214)
109 109
	}
110 110

  
111 111
	/**
112
	 * find out SVN revision number of a project
112
	 * find out the last SVN revision number of a project
113
	 * 
113 114
	 * @param id
114 115
	 * @return
115 116
	 */
116 117
	public static String getSVNQualifier(String id) {
117
		File projectDirectory = new File(System.getProperty("user.home"), "workspace047/"+id+"/"); 
118
		File projectDirectory = new File(System.getProperty("user.home"), "workspace047/"+id+"/");
119
		File svnDirectory = new File(projectDirectory, ".svn"); 
118 120
		String projectDirectoryPath = projectDirectory.getAbsolutePath();
119 121
		if (!projectDirectoryPath.endsWith("/")) projectDirectoryPath += "/";
120 122
		
......
133 135
			////		System.out.println("[" + location.toString() + "] latest date: " + entry.getDate());
134 136
			//		String svndate = entry.getDate()
135 137
			//printDebug("svn info in "+projectDirectory);
136
			if (projectDirectory.exists()) {
138
			if (projectDirectory.exists() && svnDirectory.exists()) {
137 139
				String rev = getVersions("svnversion", projectDirectoryPath).trim();
138 140
				if (rev.contains(":")) {
139 141
					rev = rev.substring(rev.indexOf(":")+1);
140 142
				}
143
				if (rev.endsWith("M")) {
144
					rev = rev.substring(0, rev.length()-1);
145
				}
141 146
				//printDebug("xml "+xml);
142 147
				printDebug(id+"="+rev);
143 148
				return rev;
144 149
			} else {
145
				return "svn";
150
				return getDateQualifier();
146 151
			}
147 152
			
148 153
			/*
tmp/org.txm.core/src/java/org/txm/Toolbox.java (revision 1214)
34 34
import java.io.FileNotFoundException;
35 35
import java.io.IOException;
36 36
import java.io.InputStreamReader;
37
import java.lang.reflect.Constructor;
38 37
import java.text.Collator;
39 38
import java.text.DateFormat;
40 39
import java.text.SimpleDateFormat;
41
import java.util.ArrayList;
42 40
import java.util.Arrays;
43 41
import java.util.LinkedHashMap;
44 42
import java.util.Locale;
45 43
import java.util.logging.Level;
46 44

  
47 45
import org.apache.commons.lang.StringUtils;
48
import org.eclipse.core.resources.IProject;
49
import org.eclipse.core.resources.IWorkspace;
50
import org.eclipse.core.resources.ProjectScope;
51
import org.eclipse.core.resources.ResourcesPlugin;
52 46
import org.eclipse.core.runtime.CoreException;
53 47
import org.eclipse.core.runtime.IConfigurationElement;
54 48
import org.eclipse.core.runtime.IProgressMonitor;
......
56 50
import org.eclipse.core.runtime.Platform;
57 51
import org.eclipse.core.runtime.RegistryFactory;
58 52
import org.eclipse.core.runtime.SafeRunner;
59
import org.eclipse.core.runtime.preferences.IScopeContext;
60 53
import org.eclipse.osgi.util.NLS;
61
import org.osgi.framework.Bundle;
62 54
import org.osgi.framework.Version;
63 55
import org.txm.core.engines.Engine;
64 56
import org.txm.core.engines.EngineType;
......
68 60
import org.txm.core.preferences.TBXPreferences;
69 61
import org.txm.core.preferences.TXMPreferences;
70 62
import org.txm.core.results.TXMResult;
71
import org.txm.objects.Project;
72 63
import org.txm.objects.Workspace;
73 64
import org.txm.utils.BundleUtils;
74 65
import org.txm.utils.DeleteDir;
......
574 565
		Version installedVersion = new Version(installedVersionString);
575 566
		Log.info("Installed toolbox version: " + installedVersion + ".");
576 567
		try {
577

  
578 568
			//System.out.println("Toolbox.startWorkspace(): workspace location = " + location);
579 569

  
580 570
			boolean doUpdateworkspace = currentVersion.compareTo(installedVersion) > 0;
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1214)
2266 2266
				child.setUserPersistable(userPersistable);
2267 2267
			}
2268 2268
		}
2269
		
2270
		// directly save and flush the preference
2271
        try {
2272
            if (this.isUserPersistable())    {
2273
                this.autoSaveParametersFromAnnotations();
2274
                this.saveParameters();
2275
                TXMPreferences.flush(this);
2276
            }
2277
        }
2278
        catch (Exception e) {
2279
            // TODO Auto-generated catch block
2280
            e.printStackTrace();
2281
        } 
2269 2282
		// Debug
2270 2283
		//		Log.finest("TXMResult.setUserPersistable(): " + userPersistable);
2271 2284
	}
tmp/org.txm.core/src/java/org/txm/objects/Workspace.java (revision 1214)
67 67
 */
68 68
public class Workspace extends TXMResult {
69 69

  
70
	private static final String CURRENTCORPUSVERSION = "0.8.0";
71

  
72 70
	private static final String NAME = "name";
73 71
	
74 72
//	/** The xmlfile. */
tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java (revision 1214)
197 197
	public static void addDefaultUpdateSites(IProvisioningAgent agent) {
198 198
		Version v = Activator.getDefault().getBundle().getVersion();
199 199
		String version =  ""+v.getMajor()+"."+v.getMinor()+"."+v.getMicro();
200
		String uriBase = TBXPreferences.getInstance().getString(TBXPreferences.UPDATESITE)+"/"+version+"/ext";
200
		String uriBase = TBXPreferences.getInstance().getString(TBXPreferences.UPDATESITE)+"/"+version+"/main";
201 201
		String uriDefault = uriBase+"/stable";
202 202
		try {
203 203
			URI repoUriDefault = new URI(uriDefault);
......
342 342
			System.out.println("No artifact repository manager found");
343 343
			return false;
344 344
		}
345
		
346
		Log.info("Add update URL: "+location);
345 347

  
346 348
		try {
347 349
			//manager.removeRepository(location)
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages_fr.properties (revision 1214)
13 13
CooccurrencesEditor_0  = Trier par : {0}
14 14
CooccurrencesEditor_10 = Cofréquence
15 15
CooccurrencesEditor_17 = Indice
16
CooccurrencesEditor_18 = Le seuil d''indice doit être un nombre réel différent de {0}
16
CooccurrencesEditor_18 = Le seuil d''indice doit être un nombre réel (valeur actuelle={0})
17 17
CooccurrencesEditor_25 = ** Une erreur est survenue lors du calcul de la taille du corpus.
18 18
CooccurrencesEditor_3  = Propriétés des cooccurrents : 
19 19
CooccurrencesEditor_4  = Seuils : Fmin ≥
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages.properties (revision 1214)
1 1

  
2 2
CoocPreferencePage_0  = Score format (default 0.0000E00)
3
CoocPreferencePage_1  = Minimum frequency threshold of the cooccurent
3
CoocPreferencePage_1  = Minimum frequency threshold of the cooccurrent
4 4
CoocPreferencePage_11 = Minimum right
5 5
CoocPreferencePage_12 = Maximum right
6
CoocPreferencePage_2  = Minimum cooccurency count threshold
7
CoocPreferencePage_3  = Minimum cooccurency score threshold
6
CoocPreferencePage_2  = Minimum cooccurrency count threshold
7
CoocPreferencePage_3  = Minimum cooccurrency score threshold
8 8
CoocPreferencePage_4  = Maximum left
9 9
CoocPreferencePage_5  = Cooccurrences
10 10
CoocPreferencePage_6  = Minimum left
......
13 13
CooccurrencesEditor_0  = Sort by: {0}
14 14
CooccurrencesEditor_10 = Cofrequency
15 15
CooccurrencesEditor_17 = Score
16
CooccurrencesEditor_18 = The score threshold must be a real number ! {0}
16
CooccurrencesEditor_18 = The score threshold must be a real number (current value={0})
17 17
CooccurrencesEditor_25 = ** Error while reading corpus size.
18 18
CooccurrencesEditor_3  = Cooccurrents properties:
19 19
CooccurrencesEditor_4  = Thresholds: Fmin ≥
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java (revision 1214)
146 146
	@Parameter(key=CooccurrencePreferences.QUERY)
147 147
	AssistedQueryWidget queryWidget;
148 148

  
149
	/** The query widget. */
150
	@Parameter(key=CooccurrencePreferences.QUERY_FILTER)
151
	AssistedQueryWidget coocQueryWidget;
149
//	/** The query widget. */
150
//	@Parameter(key=CooccurrencePreferences.QUERY_FILTER)
151
//	AssistedQueryWidget coocQueryWidget;
152 152

  
153 153
	/** The props area. */
154 154
	@Parameter(key=TXMPreferences.UNIT_PROPERTIES)
......
595 595

  
596 596
		Double minScore = 0.0;
597 597
		try {
598
			Double d = Double.parseDouble(this.minScore.getText());
598
			Double d = Double.parseDouble(this.minScore.getText().replace(",", "."));
599 599
			minScore = d;
600 600
		} catch (Exception e) {
601 601
			Log.severe(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_18, this.minScore.getText()));
tmp/org.txm.setups/SUBVERSION (revision 1214)
1
a3
tmp/org.txm.setups/shared/debian/usr/bin/TXM (revision 1214)
1 1
# This script launches TXM in the right directory and with the right TXM.ini file
2 2
UBUNTU_MENUPROXY=0
3 3
VERSION=-TXMVERSION
4
VERSIONWITHSUB=-TXMVERSIONWITHSUB
5

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

  
6 8
LOGFILESMSG=", see $HOME/TXM_PostInstallOutputLogs.txt and $HOME/TXM_PostInstallErrorLogs.txt output and error messages files."
......
9 11
exec 4>$HOME/TXM_PostInstallErrorLogs.txt
10 12

  
11 13
TXMINSTALL="/usr/lib/TXM${VERSION}"
12
TXMHOME="$HOME/TXM${VERSION}"
14
TXMHOME="$HOME/TXM${VERSIONWITHSUB}"
13 15
DOTTXMHOME="$TXMHOME/.txm"
14 16

  
15 17
(
tmp/org.txm.setups/shared/win/txm.nsi (revision 1214)
6 6

  
7 7
;general
8 8

  
9
Name "TXM 0.8.0a2"
9
Name "TXM 0.8.0a3"
10 10

  
11 11
;!define Version ""
12
!define Version "_0.8.0a2"
12
!define Version "_0.8.0a3"
13 13

  
14 14

  
15 15
OutFile "../../TXM${Version}_Win64_installer.exe"
......
98 98
FunctionEnd
99 99

  
100 100
Function MyCustomLeave
101
  ${NSD_GetState} $Checkbox1 $CheckState1
+  ${NSD_GetState} $Checkbox1 $CheckState1
102 101

  
103 102
  ${If} $CheckState1 <> 0
104 103
  
......
106 106
    
107 107
  ${EndIf}
108 108

  
109
  ${NSD_GetState} $Checkbox2 $CheckState2
+  ${NSD_GetState} $Checkbox2 $CheckState2
110 109

  
111 110
  ${If} $CheckState2 <> 0
112 111
  
......
488 488
SectionEnd
489 489

  
490 490

  
491
;UninstallText "This will uninstall TXM"
+;UninstallText "This will uninstall TXM"
492 491

  
493
 
494
;uninstaller section start
 
492
;uninstaller section start
493

  
495 494
Section "Uninstall"
496 495

  
497 496
	SetShellVarContext all
tmp/org.txm.setups/VERSION (revision 1214)
1
0.8.0a2
1
0.8.0
tmp/org.txm.setups/BuildWin64bit.sh (revision 1214)
9 9
mkdir "${APP}"
10 10

  
11 11
# ensure JRE files are here
12
if [ ! -d "shared/win/jre/bin" ]; then
12
if [ ! -d "../org.txm.rcp.feature/win/jre/bin" ]; then
13 13
	echo "** $APP: JRE files are missing."
14 14
	exit 1;
15 15
fi
tmp/org.txm.setups/BuildLinux64bit.sh (revision 1214)
1
VERSION=`cat VERSION`
1
VERSIONWITHOUTSUB=`cat VERSION`
2
SUBVERSION=`cat SUBVERSION`
3
VERSION=${VERSIONWITHOUTSUB}${SUBVERSION}
4

  
2 5
STEP=$1
3 6
ARCH="64"
4 7
ARCHCODE="x86_64"
......
63 66
# for multi installation: set the package version to txm-$VERSION
64 67
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/TXMVERSION/$VERSION/g" {} \;
65 68
find "$APP/DEBIAN/postinst" -type f -exec sed -i "s/TXMVERSION/$VERSION/g" {} \;
69
find "$APP/usr/bin/TXM" -type f -exec sed -i "s/TXMVERSIONWITHOUTSUB/${VERSIONWITHOUTSUB}/g" {} \;
66 70
find "$APP/usr/bin/TXM" -type f -exec sed -i "s/TXMVERSION/$VERSION/g" {} \;
67 71
find "$APP/DEBIAN/control" -type f -exec sed -i "s/TXMVERSION/${VERSION}/g" {} \;
68 72

  
tmp/org.txm.setups/index.html (revision 1214)
1
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2
<html><head>
3
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
4
<meta name="generator" content="ReText 4.1.2">
5
<link rel="stylesheet" type="text/css" href="index_files/sf.css">
6
<title>Téléchargement de TXM 0.8.0 α2</title>
7
</head>
8
<body>
9
<hr/>
10

  
11
<h1 align="center">Téléchargement de <span class="big">&nbsp;TXM 0.8.0&nbsp;</span> α<br>
12
<!--<img src="index_files/txm-icon.jpg"><br>-->
13
<!-- <small><a href="#fr">(instructions d'installation en français ci-dessous - FR FR FR)</a></small> -->
14
</h1>
15
<div style="background-image:url('index_files/TXM-background.jpg');background-repeat: no-repeat;background-position: right;">
16

  
17
<table >
18
<td><center><a href="TXM_0.8.0a3_Win64_installer.exe"><img width="125" src="index_files/windows-icon.png"/><br>Windows 7 et plus (64 bit)</a></center></td>
19
<td><center ><a href="TXM_0.8.0a3_Linux64_installer.deb"><img width="125" src="index_files/ubuntu-icon.png"/><br>Ubuntu 16.04 et plus</a><br></center></li><td>
20
</table>
21

  
22
<h2>Recettes</h2>
23
<ul>
24
<li><a href="https://groupes.renater.fr/wiki/txm-info/public/roadmap_0.8#recette_0_-_installation_multiple">Recette 0 </a>: installation</li>
25
<li><a href="https://groupes.renater.fr/wiki/txm-info/public/roadmap_0.8#recette_1_verification_de_toutes_les_fonctionnalites_de_txm_080" >Recette 1</a> : vérification des fonctionnalités</li>
26

  
27
</body>
28
</html>
0 29

  
tmp/org.txm.xmleditor.rcp/build.properties (revision 1214)
2 2
output..=bin/
3 3
bin.includes=plugin.xml,META-INF/,.,OSGI-INF/l10n/bundle.properties
4 4
source..=src/
5
qualifier=svn

Also available in: Unified diff