Revision 1208

tmp/org.txm.analec.feature/feature.xml (revision 1208)
74 74
      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
75 75
      <import plugin="org.txm.core" version="0.8.0" match="greaterOrEqual"/>
76 76
      <import plugin="org.txm.rcp" version="0.8.0" match="greaterOrEqual"/>
77
      <import plugin="org.txm.utils"/>
77
      <import plugin="org.txm.utils.core"/>
78 78
      <import feature="org.txm.edition.feature" version="1.0.0.qualifier"/>
79 79
      <import feature="org.txm.lexicaltable.feature" version="1.0.0.qualifier"/>
80 80
      <import feature="org.txm.progression.feature" version="1.0.0.qualifier"/>
tmp/org.txm.ahc.rcp/META-INF/MANIFEST.MF (revision 1208)
12 12
Bundle-ManifestVersion: 2
13 13
Bundle-SymbolicName: org.txm.ahc.rcp;singleton:=true
14 14
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
15
Automatic-Module-Name: org.txm.ahc.rcp
15 16

  
tmp/org.txm.annotation.rcp/META-INF/MANIFEST.MF (revision 1208)
1 1
Manifest-Version: 1.0
2 2
Require-Bundle: org.txm.annotation.core;bundle-version="1.0.0";visibility:=reexport,
3 3
 org.txm.concordance.rcp;bundle-version="1.0.0";visibility:=reexport,
4
 org.txm.core
4
 org.txm.core;visibility:=reexport
5 5
Bundle-Vendor: Textometrie.org
6 6
Bundle-Version: 1.0.0.qualifier
7 7
Bundle-Name: %Bundle-Name
tmp/org.txm.rcp/build.properties (revision 1208)
1 1
#Fri Jul 06 10:25:15 CEST 2018
2 2
output..=bin/
3 3
bin.includes=plugin.xml,META-INF/,.,splash.bmp,lib/,rcp.product,plugin_customization.ini,lib/commons-cli-1.2.jar,lib/commons-lang-2.4.jar,lib/junit-4.5.jar,lib/log4j-1.2.12.jar,installtreetagger_en.html,css/,p2.inf,bin/,OSGI-INF/,TXM.sh,icons/,OSGI-INF/l10n/bundle.properties
4
source..=src/,src/main/java/
4
source..=src/main/java/
5 5
bin.excludes=lib/batik/
6 6
qualifier=svn
tmp/org.txm.rcp/META-INF/MANIFEST.MF (revision 1208)
37 37
 org.eclipse.ui.views;bundle-version="3.9.0";visibility:=reexport,
38 38
 org.txm.groovy.core;visibility:=reexport,
39 39
 org.txm.treetagger.core;visibility:=reexport,
40
 org.eclipse.equinox.p2.discovery.compatibility;bundle-version="1.0.201"
40
 org.eclipse.equinox.p2.discovery.compatibility;bundle-version="1.0.201";visibility:=reexport
41 41
Export-Package: junit.extensions,
42 42
 junit.framework,
43 43
 junit.runner,
tmp/org.eclipse.pde.hack/META-INF/MANIFEST.MF (revision 1208)
2 2
Bundle-ManifestVersion: 2
3 3
Bundle-Name: PDE Hack
4 4
Bundle-SymbolicName: org.eclipse.pde.hack
5
Bundle-Version: 1.0.0.qualifier
5
Bundle-Version: 1.0.0
6 6
Fragment-Host: org.eclipse.pde.build;bundle-version="3.9.300"
7 7
Automatic-Module-Name: org.eclipse.pde.hack
8 8
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
tmp/org.eclipse.pde.hack/src/org/eclipse/pde/internal/build/site/QualifierReplacer.java (revision 1208)
114 114
	 * @return
115 115
	 */
116 116
	public static String getSVNQualifier(String id) {
117
		String projectDirectory = new File(System.getProperty("user.home"), "workspace047/"+id+"/").getAbsolutePath();
118
		if (!projectDirectory.endsWith("/")) projectDirectory += "/";
117
		File projectDirectory = new File(System.getProperty("user.home"), "workspace047/"+id+"/"); 
118
		String projectDirectoryPath = projectDirectory.getAbsolutePath();
119
		if (!projectDirectoryPath.endsWith("/")) projectDirectoryPath += "/";
119 120
		
120 121
		try {
121 122
			//		SVNWCClient client = SVNClientManager.newInstance().getWCClient();
......
132 133
			////		System.out.println("[" + location.toString() + "] latest date: " + entry.getDate());
133 134
			//		String svndate = entry.getDate()
134 135
			//printDebug("svn info in "+projectDirectory);
135
			String xml = getXML("svn","info","--xml", projectDirectory);
136
			//printDebug("xml "+xml);
137
			String rev = getRev(xml);
138
			printDebug(id+"="+rev);
139
			return rev;
136
			if (projectDirectory.exists()) {
137
				String rev = getVersions("svnversion", projectDirectoryPath).trim();
138
				if (rev.contains(":")) {
139
					rev = rev.substring(rev.indexOf(":")+1);
140
				}
141
				//printDebug("xml "+xml);
142
				printDebug(id+"="+rev);
143
				return rev;
144
			} else {
145
				return "svn";
146
			}
147
			
140 148
			/*
141 149
		String svndate = null;
142 150
		SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd-HHmm");
......
149 157
		}
150 158
	}
151 159

  
152
	private static String getRev(String xml) {
153
		Pattern p = Pattern.compile("<commit\n" + 
154
				"   revision=\"([^\\\"]+)\"");
155
		Matcher m = p.matcher(xml);
156
		if (m.find()) {
157
			return m.group(1).trim();
158
		}
159
		printDebug("Wrong XML ? "+xml);
160
		return "error";
161
	}
162

  
163
	private static String getXML(String... args) throws IOException {
160
	private static String getVersions(String... args) throws IOException {
164 161
		ProcessBuilder builder = new ProcessBuilder(args);
165 162
		builder.redirectErrorStream(true);
166 163
		Process process = builder.start();
tmp/org.txm.tokenizer.core/META-INF/MANIFEST.MF (revision 1208)
8 8
Export-Package: org.txm.tokenizer
9 9
Require-Bundle: org.txm.libs.groovy-all;bundle-version="2.3.7";visibility:=reexport,
10 10
 org.txm.utils.core;bundle-version="1.0.0";visibility:=reexport,
11
 org.eclipse.core.resources
11
 org.eclipse.core.resources;visibility:=reexport
tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java (revision 1208)
174 174
		preferences.putBoolean(AUTO_PERSISTENCE_ENABLED, false);
175 175
		
176 176
		if (Toolbox.getTxmHomePath().endsWith("-dev")) {
177
			preferences.put(UPDATESITE, "file:///"+System.getProperty("user.home")+"/workspace047/TXMReleasePlugins.site");
177
			preferences.put(UPDATESITE, "file://"+System.getProperty("user.home")+"/workspace047/TXMReleasePlugins.site");
178 178
		} else {
179 179
			preferences.put(UPDATESITE, "http://textometrie.ens-lyon.fr/dist");
180 180
		}
tmp/org.txm.core/build.properties (revision 1208)
22 22
               .,\
23 23
               lib/juniversalchardet-1.0.3.jar,\
24 24
               lib/textcat-1.0.1.jar,\
25
               lib/jtidy-r938.jar,\
26 25
               lib/json-20090211.jar,\
27 26
               lib/juh-3.2.1.jar,\
28 27
               lib/jurt-3.2.1.jar,\
29 28
               lib/ridl-3.2.1.jar,\
30 29
               lib/unoil-3.2.1.jar,\
31
               src/groovy/,\
32 30
               plugin.xml,\
33 31
               lib/sqlite-jdbc-3.8.11.2.jar,\
34 32
               lib/postgresql-9.4.1207.jre6.jar,\
......
37 35
               res/org/,\
38 36
               schema/
39 37
output..=bin/
40
source..=src/java/,res/
38
source..=src/java/,res/,test/
41 39
bin.excludes=META-INF/TSTMANIFEST.MF
42 40
qualifier=svn
43 41
sourceFileExtensions=*.java, *.groovy
tmp/org.txm.dictionary.rcp/META-INF/MANIFEST.MF (revision 1208)
9 9
 org.txm.index.core;bundle-version="1.0.0";visibility:=reexport,
10 10
 org.txm.index.rcp;bundle-version="1.0.0";visibility:=reexport,
11 11
 javax.persistence;visibility:=reexport,
12
 org.txm.annotation.kr.core;bundle-version="1.0.0"
12
 org.txm.annotation.kr.core;bundle-version="1.0.0";visibility:=reexport
13 13
Export-Package: org.txm.dictionary.commands,
14 14
 org.txm.dictionary.functions.jpa,
15 15
 org.txm.dictionary.functions.sql,
tmp/org.txm.core.tests/src/org/txm/core/tests/junit/PluginsManifest.java (revision 1208)
21 21

  
22 22
	@Override
23 23
	public void RCPPluginTest(File projectDirectory, String name, String packagePath) throws IOException {
24
		File manifestFile = new File(projectDirectory, "META-INF/MANIFEST.MF");
25
		if (!manifestFile.exists()) {
26
			error("missing file "+manifestFile);
27
		}
28

  
29 24
		testDependenciesExport(projectDirectory);
30 25
	}
26
	
27
	@Override
28
	public void FeaturePluginTest(File projectDirectory, String name, String packagePath) throws IOException {
29
		//testDependenciesExport(projectDirectory);
30
	}
31 31

  
32 32
	private void testDependenciesExport(File projectDirectory) throws IOException {
33 33
		File manifestFile = new File(projectDirectory, "META-INF/MANIFEST.MF");
34
		
35
		if (!manifestFile.exists()) {
36
			error("missing file "+manifestFile);
37
			return;
38
		}
39
		
34 40
		File manifestFixFile = new File(projectDirectory, "META-INF/MANIFEST-FIX.MF");
35 41
		
36 42
		Manifest manifest = new Manifest(manifestFile.toURI().toURL().openStream());
tmp/org.txm.core.tests/src/org/txm/core/tests/junit/PluginBuildProperties.java (revision 1208)
13 13

  
14 14
	HashMap<String, HashMap<String, String>> ext_points = new HashMap<String, HashMap<String, String>>();
15 15
	boolean massfix = false;
16
	
16

  
17 17
	@Override
18 18
	public void TBXPluginTest(File projectDirectory, String name, String packagePath) throws IOException {
19 19
		File buildFile = testBuildFile(projectDirectory);
20
		if (buildFile == null) return;
21
		
20
		if (buildFile == null) {
21
			return;
22
		}
23

  
22 24
		Properties props = getProperties(buildFile);
23
		
25

  
24 26
		testBinIncludes(props, buildFile);
25 27
		testQualifier(props, buildFile);
26 28
	}
......
28 30
	@Override
29 31
	public void RCPPluginTest(File projectDirectory, String name, String packagePath) throws IOException {
30 32
		File buildFile = testBuildFile(projectDirectory);
31
		if (buildFile == null) return;
32
		
33
		if (buildFile == null)
34
			return;
35

  
33 36
		Properties props = getProperties(buildFile);
34
		
37

  
35 38
		testBinIncludes(props, buildFile);
36 39
		testQualifier(props, buildFile);
37 40
	}
38
	
41

  
39 42
	@Override
40 43
	public void FeaturePluginTest(File projectDirectory, String name, String packagePath) throws IOException {
41 44
		File buildFile = testBuildFile(projectDirectory);
42
		if (buildFile == null) return;
43
		
45
		if (buildFile == null)
46
			return;
47

  
44 48
		Properties props = getProperties(buildFile);
45
		
49

  
46 50
		testQualifier(props, buildFile);
47 51
	}
48
	
49
	
52

  
50 53
	public static Properties getProperties(File buildFile) throws UnsupportedEncodingException, FileNotFoundException, IOException {
51 54
		Properties props = new Properties();
52 55
		props.load(IOUtils.getReader(buildFile));
......
56 59
	public void testQualifier(Properties props, File buildFile) throws UnsupportedEncodingException, FileNotFoundException, IOException {
57 60
		Object o = props.get("qualifier");
58 61
		if (o == null) {
59
			error("QUALIFIER not set to 'svn': "+buildFile.getAbsolutePath());
62
			error("QUALIFIER not set to 'svn': " + buildFile.getAbsolutePath());
60 63
		} else {
61 64
			String value = o.toString();
62 65
			if (!value.equals("svn")) {
63
				error("QUALIFIER not set to 'svn': "+buildFile.getAbsolutePath());
66
				error("QUALIFIER not set to 'svn': " + buildFile.getAbsolutePath());
64 67
				if (massfix) {
65
					IOUtils.write(buildFile, IOUtils.getText(buildFile, "UTF-8")+"\nqualifier=svn\n");
68
					IOUtils.write(buildFile, IOUtils.getText(buildFile, "UTF-8") + "\nqualifier=svn\n");
66 69
				}
67 70
			}
68 71
		}
69 72
	}
70
	
73

  
71 74
	public void testBinIncludes(Properties props, File buildFile) {
72 75
		String value = (String) props.get("bin.includes");
73
		//System.out.println("buildFile="+buildFile+" value="+value);
76
		// System.out.println("buildFile="+buildFile+" value="+value);
74 77
		File pluginXML = new File(buildFile.getParentFile(), "plugin.xml");
75 78
		if (pluginXML.exists() && !value.contains("plugin.xml")) {
76
			error("plugin.xml is not exported: "+buildFile.getAbsolutePath());
79
			error("plugin.xml is not exported: " + buildFile.getAbsolutePath());
77 80
		}
78 81
		if (!value.contains("META-INF/")) {
79
			error("META-INF is not exported: "+buildFile.getAbsolutePath());
82
			error("META-INF is not exported: " + buildFile.getAbsolutePath());
80 83
		}
81 84
	}
82
	
85

  
83 86
	private File testBuildFile(File projectDirectory) throws IOException {
84 87
		File buildFile = new File(projectDirectory, "build.properties");
85
		
88

  
86 89
		if (!buildFile.exists()) {
87
			error("no build.properties: "+buildFile.getAbsolutePath());
90
			error("no build.properties: " + buildFile.getAbsolutePath());
88 91
			return null;
89 92
		}
90
		
93

  
91 94
		return buildFile;
92 95
	}
93 96

  
94 97
	@Override
95 98
	public void gatherData() {
96
		
99

  
97 100
	}
98 101
}
tmp/org.txm.annotation.core/META-INF/MANIFEST.MF (revision 1208)
11 11
Export-Package: org.txm.annotation.core,
12 12
 org.txm.annotation.core.preferences
13 13
Bundle-Vendor: Textometrie.org
14

  
14
Automatic-Module-Name: org.txm.annotation.core
tmp/org.txm.searchengine.cqp.feature/feature.xml (revision 1208)
18 18
   </license>
19 19

  
20 20
   <requires>
21
      <import plugin="org.txm.utils" version="1.0.0" match="greaterOrEqual"/>
21
      <import plugin="org.txm.utils.core" version="1.0.0" match="greaterOrEqual"/>
22 22
      <import plugin="org.txm.core"/>
23 23
      <import plugin="org.txm.searchengine.core" version="1.0.0" match="greaterOrEqual"/>
24 24
      <import plugin="org.txm.libs.cqp" version="1.0.0" match="greaterOrEqual"/>
tmp/org.txm.translate.rcp/META-INF/MANIFEST.MF (revision 1208)
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Automatic-Module-Name: org.txm.translate.rcp
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
8
Require-Bundle: org.txm.rcp;bundle-version="0.8.0",
9
 org.eclipse.search;bundle-version="3.11.100"
8
Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,
9
 org.eclipse.search;bundle-version="3.11.100";visibility:=reexport
tmp/org.txm.ahc.core/META-INF/MANIFEST.MF (revision 1208)
10 10
Bundle-ManifestVersion: 2
11 11
Bundle-SymbolicName: org.txm.ahc.core;singleton:=true
12 12
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
13
Automatic-Module-Name: org.txm.ahc.core
tmp/org.txm.textsbalance.feature/feature.xml (revision 1208)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<feature
3
      id="org.txm.textbalance.feature"
3
      id="org.txm.textsbalance.feature"
4 4
      label="Texts Balance"
5 5
      version="1.0.0.qualifier"
6 6
      provider-name="TXM">
tmp/org.txm.annotation.kr.core/META-INF/MANIFEST.MF (revision 1208)
72 72
Meta-Persistence: META-INF/persistence.xml
73 73
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
74 74
Bundle-Vendor: Textometrie.org
75

  
75
Automatic-Module-Name: org.txm.annotation.kr.core
tmp/org.txm.oriflamms.rcp/META-INF/MANIFEST.MF (revision 1208)
1 1
Manifest-Version: 1.0
2 2
Require-Bundle: org.txm.rcp;visibility:=reexport,
3
 org.txm.searchengine.cqp.rcp;bundle-version="1.0.0"
3
 org.txm.searchengine.cqp.rcp;bundle-version="1.0.0";visibility:=reexport
4 4
Bundle-Vendor: Textometrie.org
5 5
Bundle-ActivationPolicy: lazy
6 6
Bundle-Version: 1.0.0.qualifier
tmp/org.txm.groovy.core/META-INF/MANIFEST.MF (revision 1208)
8 8
Bundle-SymbolicName: org.txm.groovy.core;singleton:=true
9 9
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
10 10
Require-Bundle: org.txm.core;bundle-version="0.8.0";visibility:=reexport,
11
 org.txm.annotation.core,
12
 org.txm.searchengine.cqp.core,
13
 org.txm.tokenizer.core
11
 org.txm.annotation.core;visibility:=reexport,
12
 org.txm.searchengine.cqp.core;visibility:=reexport,
13
 org.txm.tokenizer.core;visibility:=reexport
14 14

  
tmp/org.txm.groovy.core/build.properties (revision 1208)
2 2
bin.includes=META-INF/,.,bin/,plugin.xml,src/groovy/org/,src/groovy/tests/,src/groovy/filters/
3 3
output..=bin/
4 4
jars.compile.order=.
5
source..=src/
5
source..=src/java/
6 6
qualifier=svn

Also available in: Unified diff