Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 251402 | Differences between
and this patch

Collapse All | Expand All

(-)builder/tests/scripts/runtests.bat (-1 / +1 lines)
Lines 36-42 Link Here
36
REM ****************************************************************
36
REM ****************************************************************
37
37
38
unzip -qq -o eclipse-SDK*.zip
38
unzip -qq -o eclipse-SDK*.zip
39
unzip -qq -o -C emf-sdo-xsd-JUnit-Tests*.zip */plugins/org.eclipse.test*
39
unzip -qq -o -C emf-xsd-JUnit-Tests*.zip */plugins/org.eclipse.test*
40
40
41
41
42
:processcmdlineargs
42
:processcmdlineargs
(-)builder/tests/scripts/test.xml (-10 / +5 lines)
Lines 32-40 Link Here
32
32
33
		<unzip dest="${install}" overwrite="true"><fileset dir="${downloadsDir}"><include name="**/${eclipseFile}.zip"/></fileset></unzip>
33
		<unzip dest="${install}" overwrite="true"><fileset dir="${downloadsDir}"><include name="**/${eclipseFile}.zip"/></fileset></unzip>
34
		<untar compression="gzip" dest="${install}" overwrite="true"><fileset dir="${downloadsDir}"><include name="**/${eclipseFile}.tar.gz"/></fileset></untar>
34
		<untar compression="gzip" dest="${install}" overwrite="true"><fileset dir="${downloadsDir}"><include name="**/${eclipseFile}.tar.gz"/></fileset></untar>
35
		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-sdo-xsd-SDK-*.zip"/></fileset></unzip>
35
		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-xsd-SDK-*.zip"/></fileset></unzip>
36
		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-sdo-xsd-Examples-*.zip"/></fileset></unzip>
36
		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-xsd-Examples-*.zip"/></fileset></unzip>
37
		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-sdo-xsd-JUnit-Tests-*.zip"/></fileset></unzip>
37
		<unzip dest="${install}/eclipse/dropins" overwrite="true"><fileset dir="."><include name="**/emf-xsd-JUnit-Tests-*.zip"/></fileset></unzip>
38
38
39
		<echo message="install: ${install}, dropins: ${install}/eclipse/dropins"/>
39
		<echo message="install: ${install}, dropins: ${install}/eclipse/dropins"/>
40
	    <echo message="eclipse-home: ${eclipse-home}, dropins-eclipse-home: ${eclipse-home}/dropins/eclipse"/>
40
	    <echo message="eclipse-home: ${eclipse-home}, dropins-eclipse-home: ${eclipse-home}/dropins/eclipse"/>
Lines 55-61 Link Here
55
		<echo message="Done: [${runtests-endtime}]"/>
55
		<echo message="Done: [${runtests-endtime}]"/>
56
	</target>
56
	</target>
57
57
58
	<target name="emf-sdo-xsd" description="Runs the test.xml of the test plugins">
58
	<target name="emf-xsd" description="Runs the test.xml of the test plugins">
59
		<antcall target="runtests">
59
		<antcall target="runtests">
60
			<param name="testPlugin" value="${org.eclipse.emf.test.build}" />
60
			<param name="testPlugin" value="${org.eclipse.emf.test.build}" />
61
			<param name="report" value="org.eclipse.emf.test.build" />
61
			<param name="report" value="org.eclipse.emf.test.build" />
Lines 72-82 Link Here
72
		</antcall>
72
		</antcall>
73
73
74
		<antcall target="runtests">
74
		<antcall target="runtests">
75
			<param name="testPlugin" value="${org.eclipse.emf.test.sdo}" />
76
			<param name="report" value="org.eclipse.emf.test.sdo" />
77
		</antcall>
78
79
		<antcall target="runtests">
80
			<param name="testPlugin" value="${org.eclipse.emf.test.tools}" />
75
			<param name="testPlugin" value="${org.eclipse.emf.test.tools}" />
81
			<param name="report" value="org.eclipse.emf.test.tools" />
76
			<param name="report" value="org.eclipse.emf.test.tools" />
82
		</antcall>
77
		</antcall>
Lines 93-99 Link Here
93
	</target>
88
	</target>
94
89
95
	<target name="all">
90
	<target name="all">
96
		<antcall target="emf-sdo-xsd" />
91
		<antcall target="emf-xsd" />
97
		<antcall target="genHtml" />
92
		<antcall target="genHtml" />
98
	</target>
93
	</target>
99
94
(-)builder/tests/scripts/readme.html (-3 / +3 lines)
Lines 29-39 Link Here
29
  3. The Automated Test feature from a
29
  3. The Automated Test feature from a
30
  <a href="http|//download.eclipse.org/tools/emf/downloads/"> EMF downloads</a>.
30
  <a href="http|//download.eclipse.org/tools/emf/downloads/"> EMF downloads</a>.
31
  This contains the test framework plugins and the JUnit test plugins to run.<br/>
31
  This contains the test framework plugins and the JUnit test plugins to run.<br/>
32
  4. The emf-runtime, sdo-runtime and xsd-runtime zip files from the same build as the Automated Test feature.  You can use the emf-sdo-xsd-SDK zip file instead of the individual files.<br/>
32
  4. The emf-runtime and xsd-runtime zip files from the same build as the Automated Test feature.  You can use the emf-xsd-SDK zip file instead of the individual files.<br/>
33
  5. An Eclipse SDK zip file. The URL and build name of the required builds
33
  5. An Eclipse SDK zip file. The URL and build name of the required builds
34
  are specified in the build.cfg file included in the Automated Test zip file.</p>
34
  are specified in the build.cfg file included in the Automated Test zip file.</p>
35
<p><font size="+1">Setup</font></p>
35
<p><font size="+1">Setup</font></p>
36
<p>1. Extract the emf-sdo-xsd-Automated-Tests-&lt;buildid&gt;.zip. On Window, extract
36
<p>1. Extract the emf-xsd-Automated-Tests-&lt;buildid&gt;.zip. On Window, extract
37
  this file close to the root of the drive to prevent some path names from exceeding
37
  this file close to the root of the drive to prevent some path names from exceeding
38
  the 255 character limit. This will create a top-level directory &quot;<i>testing</i>&quot;.<br/>
38
  the 255 character limit. This will create a top-level directory &quot;<i>testing</i>&quot;.<br/>
39
  2. Place the Eclipse SDK zip file and the EMF, SDO and XSD runtimes in the <i>testing</i> directory.
39
  2. Place the Eclipse SDK zip file and the EMF, SDO and XSD runtimes in the <i>testing</i> directory.
Lines 104-110 Link Here
104
    <td>Runs all the targets below.</td>
104
    <td>Runs all the targets below.</td>
105
  </tr>
105
  </tr>
106
  <tr>
106
  <tr>
107
    <td>emf-sdo-xsd</td>
107
    <td>emf-xsd</td>
108
    <td>Runs the JUnit tests located in the test plug-ins</td>
108
    <td>Runs the JUnit tests located in the test plug-ins</td>
109
  </tr>
109
  </tr>
110
  <tr>
110
  <tr>
(-)templateFiles/testManifest.xml.template (-24 / +4 lines)
Lines 15-34 Link Here
15
				fileName='&lt;a href="emf-sourcedoc-@build@.zip"&gt;emf-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="emf-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
15
				fileName='&lt;a href="emf-sourcedoc-@build@.zip"&gt;emf-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="emf-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
16
			</platform>
16
			</platform>
17
		</zipType>
17
		</zipType>
18
		<zipType name="sdoruntime">
19
			<platform 
20
				id="SDORUN" 
21
				name="All" 
22
				fileName='&lt;a href="sdo-runtime-@build@.zip"&gt;sdo-runtime-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@sdo-runtime-@build@.zip.size@ - checksum:&lt;a href="sdo-runtime-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
23
			</platform>
24
		</zipType>
25
		<zipType name="sdosrc">
26
			<platform 
27
				id="SDOSRC" 
28
				name="All" 
29
				fileName='&lt;a href="sdo-sourcedoc-@build@.zip"&gt;sdo-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@sdo-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="sdo-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
30
			</platform>
31
		</zipType>
32
		<zipType name="xsdruntime">
18
		<zipType name="xsdruntime">
33
			<platform 
19
			<platform 
34
				id="XSDRUN" 
20
				id="XSDRUN" 
Lines 47-74 Link Here
47
			<platform 
33
			<platform 
48
				id="SDK" 
34
				id="SDK" 
49
				name="All" 
35
				name="All" 
50
				fileName='&lt;a href="emf-sdo-xsd-SDK-@build@.zip"&gt;emf-sdo-xsd-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-SDK-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
36
				fileName='&lt;a href="emf-xsd-SDK-@build@.zip"&gt;emf-xsd-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-SDK-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
51
			</platform>
37
			</platform>
52
		</zipType>
38
		</zipType>
53
		<zipType name="alltests">
39
		<zipType name="alltests">
54
			<platform 
40
			<platform 
55
				id="T" 
41
				id="T" 
56
				name="All" 
42
				name="All" 
57
				fileName='&lt;a href="emf-sdo-xsd-Automated-Tests-@build@.zip"&gt;emf-sdo-xsd-Automated-Tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Automated-Tests-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
43
				fileName='&lt;a href="emf-xsd-Automated-Tests-@build@.zip"&gt;emf-xsd-Automated-Tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Automated-Tests-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
58
			</platform>
44
			</platform>
59
		</zipType>
45
		</zipType>
60
		<zipType name="allexamples">
46
		<zipType name="allexamples">
61
			<platform 
47
			<platform 
62
				id="EX" 
48
				id="EX" 
63
				name="All" 
49
				name="All" 
64
				fileName='&lt;a href="emf-sdo-xsd-Examples-@build@.zip"&gt;emf-sdo-xsd-Examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Examples-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
50
				fileName='&lt;a href="emf-xsd-Examples-@build@.zip"&gt;emf-xsd-Examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Examples-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
65
			</platform>
51
			</platform>
66
		</zipType>
52
		</zipType>
67
		<zipType name="allModels">
53
		<zipType name="allModels">
68
			<platform 
54
			<platform 
69
				id="AM" 
55
				id="AM" 
70
				name="All" 
56
				name="All" 
71
				fileName='&lt;a href="emf-sdo-xsd-Models-@build@.zip"&gt;emf-sdo-xsd-Models-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Models-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Models-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
57
				fileName='&lt;a href="emf-xsd-Models-@build@.zip"&gt;emf-xsd-Models-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Models-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Models-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
72
			</platform>
58
			</platform>
73
		</zipType>
59
		</zipType>
74
	</zipTypes>
60
	</zipTypes>
Lines 108-119 Link Here
108
			<effectedFile id="XSDRUN"></effectedFile>
94
			<effectedFile id="XSDRUN"></effectedFile>
109
		</logFile>
95
		</logFile>
110
96
111
		<logFile name="org.eclipse.emf.test.sdo_linux.gtk.xml">
112
			<effectedFile id="SDK"></effectedFile>
113
			<effectedFile id="EMFSRC"></effectedFile>
114
			<effectedFile id="EMFRUN"></effectedFile>
115
		</logFile>
116
117
		<logFile name="org.eclipse.emf.test.examples_linux.gtk.xml">
97
		<logFile name="org.eclipse.emf.test.examples_linux.gtk.xml">
118
			<effectedFile id="SDK"></effectedFile>
98
			<effectedFile id="SDK"></effectedFile>
119
			<effectedFile id="EMFSRC"></effectedFile>
99
			<effectedFile id="EMFSRC"></effectedFile>
(-)builder/zips/build.xml (-2 / +1 lines)
Lines 12-18 Link Here
12
  <property name="rootDir" value="emf" />
12
  <property name="rootDir" value="emf" />
13
13
14
  <target name="models">
14
  <target name="models">
15
    <property name="modelsZip" value="${outputDir}/emf-sdo-xsd-Models-${buildAlias}.zip" />
15
    <property name="modelsZip" value="${outputDir}/emf-xsd-Models-${buildAlias}.zip" />
16
    <property name="modelsBaseDir" value="${rootDir}/models" />
16
    <property name="modelsBaseDir" value="${rootDir}/models" />
17
    <property name="modelsWorkingDir" value="${pluginsDir}/temp.dir.models" />
17
    <property name="modelsWorkingDir" value="${pluginsDir}/temp.dir.models" />
18
18
Lines 38-44 Link Here
38
    <copyModels pluginDir="org.eclipse.emf.codegen.ecore" />
38
    <copyModels pluginDir="org.eclipse.emf.codegen.ecore" />
39
    <copyModels pluginDir="org.eclipse.emf.ecore" />
39
    <copyModels pluginDir="org.eclipse.emf.ecore" />
40
    <copyModels pluginDir="org.eclipse.emf.ecore.change" />
40
    <copyModels pluginDir="org.eclipse.emf.ecore.change" />
41
    <copyModels pluginDir="org.eclipse.emf.ecore.sdo" />
42
    <copyModels pluginDir="org.eclipse.emf.edit" />
41
    <copyModels pluginDir="org.eclipse.emf.edit" />
43
    <copyModels pluginDir="org.eclipse.emf.mapping" />
42
    <copyModels pluginDir="org.eclipse.emf.mapping" />
44
    <copyModels pluginDir="org.eclipse.emf.mapping.ecore2ecore" />
43
    <copyModels pluginDir="org.eclipse.emf.mapping.ecore2ecore" />
(-)scripts/runJDK14Tests.sh (-5 / +5 lines)
Lines 5-11 Link Here
5
#X#  -downloadsDir /home/www-data/build/downloads \
5
#X#  -downloadsDir /home/www-data/build/downloads \
6
#X#  -testDir /home/www-data/jdk14tests/2.0.1/N200409162018/200409171711 \
6
#X#  -testDir /home/www-data/jdk14tests/2.0.1/N200409162018/200409171711 \
7
#X#  -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
7
#X#  -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
8
#X#  -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-sdo-xsd-SDK-N200409162018.zip \
8
#X#  -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-xsd-SDK-N200409162018.zip \
9
#X#  -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt 
9
#X#  -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt 
10
10
11
export ANT=/opt/apache-ant-1.6/bin/ant
11
export ANT=/opt/apache-ant-1.6/bin/ant
Lines 63-69 Link Here
63
	echo "   -downloadsDir /home/www-data/build/downloads \\"
63
	echo "   -downloadsDir /home/www-data/build/downloads \\"
64
	echo "   -testDir /home/www-data/jdk14tests/2.0.1/R200409171617/200409221449 \\"
64
	echo "   -testDir /home/www-data/jdk14tests/2.0.1/R200409171617/200409221449 \\"
65
	echo "   -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161125/eclipse-SDK-3.0.1-linux-gtk.zip \\"
65
	echo "   -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161125/eclipse-SDK-3.0.1-linux-gtk.zip \\"
66
	echo "   -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-sdo-xsd-SDK-2.0.1.zip \\"
66
	echo "   -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-xsd-SDK-2.0.1.zip \\"
67
	echo "   -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
67
	echo "   -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
68
	exit 1
68
	exit 1
69
fi
69
fi
Lines 298-304 Link Here
298
echo "[jdk] 1/2 unzip Automated-Tests*.zip ... "
298
echo "[jdk] 1/2 unzip Automated-Tests*.zip ... "
299
unzip -uoj $quietZip $emfTestFile -d $testDir/tests ;
299
unzip -uoj $quietZip $emfTestFile -d $testDir/tests ;
300
300
301
emfTestFile="$testDir/tests/emf-sdo-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
301
emfTestFile="$testDir/tests/emf-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
302
echo "[jdk] 2/2 unzip JUnit-Tests*.zip ... "
302
echo "[jdk] 2/2 unzip JUnit-Tests*.zip ... "
303
unzip -uo $quietZip $emfTestFile -d $testDir/tests ;
303
unzip -uo $quietZip $emfTestFile -d $testDir/tests ;
304
304
Lines 317-323 Link Here
317
}
317
}
318
318
319
# for org.eclipse.emf.test.* ...
319
# for org.eclipse.emf.test.* ...
320
for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
320
for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
321
	getTestFolder $pluginSuf;
321
	getTestFolder $pluginSuf;
322
	if [ "x$testFolder" != "x" ]; then
322
	if [ "x$testFolder" != "x" ]; then
323
		#echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
323
		#echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
Lines 333-339 Link Here
333
echo "clean up ..."
333
echo "clean up ..."
334
rm -fr $testDir/tests/eclipse
334
rm -fr $testDir/tests/eclipse
335
335
336
for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
336
for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
337
	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
337
	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
338
		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
338
		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
339
		#echo "[jdk] unzip test.$pluginSuf.jar ..."
339
		#echo "[jdk] unzip test.$pluginSuf.jar ..."
(-)scripts/runJDK50Tests.sh (-6 / +6 lines)
Lines 5-11 Link Here
5
#X#  -downloadsDir /home/www-data/build/downloads \
5
#X#  -downloadsDir /home/www-data/build/downloads \
6
#X#  -testDir /home/www-data/jdk50tests/2.0.1/N200409162018/200409171711 \
6
#X#  -testDir /home/www-data/jdk50tests/2.0.1/N200409162018/200409171711 \
7
#X#  -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
7
#X#  -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
8
#X#  -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-sdo-xsd-SDK-N200409162018.zip \
8
#X#  -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-xsd-SDK-N200409162018.zip \
9
#X#  -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt
9
#X#  -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt
10
10
11
ver=5;
11
ver=5;
Lines 63-69 Link Here
63
	echo "   -downloadsDir /home/www-data/build/downloads \\"
63
	echo "   -downloadsDir /home/www-data/build/downloads \\"
64
	echo "   -testDir /home/www-data/jdk${ver}0tests/2.0.1/R200409171617/200409221349 \\"
64
	echo "   -testDir /home/www-data/jdk${ver}0tests/2.0.1/R200409171617/200409221349 \\"
65
	echo "   -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161129/eclipse-SDK-3.0.1-linux-gtk.zip \\"
65
	echo "   -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161129/eclipse-SDK-3.0.1-linux-gtk.zip \\"
66
	echo "   -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-sdo-xsd-SDK-2.0.1.zip \\"
66
	echo "   -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-xsd-SDK-2.0.1.zip \\"
67
	echo "   -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
67
	echo "   -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
68
	exit 1
68
	exit 1
69
fi
69
fi
Lines 288-294 Link Here
288
echo "[jdk] 1/2 unzip Automated-Tests*.zip ... "
288
echo "[jdk] 1/2 unzip Automated-Tests*.zip ... "
289
unzip -uoj $quietZip $emfTestFile -d $testDir/tests ;
289
unzip -uoj $quietZip $emfTestFile -d $testDir/tests ;
290
290
291
emfTestFile="$testDir/tests/emf-sdo-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
291
emfTestFile="$testDir/tests/emf-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
292
echo "[jdk] 2/2 unzip JUnit-Tests*.zip ... "
292
echo "[jdk] 2/2 unzip JUnit-Tests*.zip ... "
293
unzip -uo $quietZip $emfTestFile -d $testDir/tests ;
293
unzip -uo $quietZip $emfTestFile -d $testDir/tests ;
294
294
Lines 303-309 Link Here
303
}
303
}
304
304
305
# for org.eclipse.emf.test.* ...
305
# for org.eclipse.emf.test.* ...
306
for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
306
for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
307
	getTestFolder $pluginSuf;
307
	getTestFolder $pluginSuf;
308
	if [ "x$testFolder" != "x" ]; then
308
	if [ "x$testFolder" != "x" ]; then
309
		#echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
309
		#echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
Lines 319-325 Link Here
319
echo "clean up ..."
319
echo "clean up ..."
320
rm -fr $testDir/tests/eclipse
320
rm -fr $testDir/tests/eclipse
321
321
322
for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
322
for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
323
	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
323
	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
324
		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
324
		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
325
		#echo "[jdk] unzip test.$pluginSuf.jar ..."
325
		#echo "[jdk] unzip test.$pluginSuf.jar ..."
Lines 338-344 Link Here
338
export PLUGINS_DIR=$ECLIPSE_DIR/plugins
338
export PLUGINS_DIR=$ECLIPSE_DIR/plugins
339
339
340
# check to see what JDK was used for the actual build
340
# check to see what JDK was used for the actual build
341
#eg., for emfFile=/home/www-data/build/emf/tools/emf/downloads/drops/2.3.0/N200612201119/emf-sdo-SDK-N200612201119.zip
341
#eg., for emfFile=/home/www-data/build/emf/tools/emf/downloads/drops/2.3.0/N200612201119/emf-SDK-N200612201119.zip
342
buildJava=$(grep "javaHome=" ${emfFile%/*}/build.cfg | tail -1); buildJava=${buildJava#*=}; # echo $buildJava
342
buildJava=$(grep "javaHome=" ${emfFile%/*}/build.cfg | tail -1); buildJava=${buildJava#*=}; # echo $buildJava
343
343
344
if [[ ${version:0:3} == 2.2 ]]; then # a 2.2 build
344
if [[ ${version:0:3} == 2.2 ]]; then # a 2.2 build
(-)scripts/promoteToEclipse.sh (-9 / +3 lines)
Lines 662-675 Link Here
662
662
663
	# find dependencyURLs from $buildDropsDir/$branch/$buildID/buildlog.txt
663
	# find dependencyURLs from $buildDropsDir/$branch/$buildID/buildlog.txt
664
	# http://download.eclipse.org/downloads/drops/M20060609-1217/eclipse-SDK-M20060609-1217-linux-gtk.tar.gz
664
	# http://download.eclipse.org/downloads/drops/M20060609-1217/eclipse-SDK-M20060609-1217-linux-gtk.tar.gz
665
	# http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.0/I200606150000/emf-sdo-xsd-SDK-I200606150000.zip
665
	# http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.0/I200606150000/emf-xsd-SDK-I200606150000.zip
666
	dependencyURLs="";
666
	dependencyURLs="";
667
	for dep in `head -50 $buildDropsDir/$branch/$buildID/buildlog.txt | grep "\-URL" | sed -e "s/^[^hf]\\+//g" -e "s/fullmoon\..\\+\.ibm\.com/download.eclipse.org/g" | sort | uniq`; do 
667
	for dep in `head -50 $buildDropsDir/$branch/$buildID/buildlog.txt | grep "\-URL" | sed -e "s/^[^hf]\\+//g" -e "s/fullmoon\..\\+\.ibm\.com/download.eclipse.org/g" | sort | uniq`; do 
668
		if [ "x$dependencyURLs" != "x" ]; then dependencyURLs="$dependencyURLs,"; fi # join with commas
668
		if [ "x$dependencyURLs" != "x" ]; then dependencyURLs="$dependencyURLs,"; fi # join with commas
669
		dependencyURLs=$dependencyURLs"$dep";
669
		dependencyURLs=$dependencyURLs"$dep";
670
		if [[ $debug -gt 0 ]]; then echo "[promote] Using URL = $dep"; fi			
670
		if [[ $debug -gt 0 ]]; then echo "[promote] Using URL = $dep"; fi			
671
	done
671
	done
672
	# http://download.eclipse.org/downloads/drops/M20060609-1217/eclipse-SDK-M20060609-1217-linux-gtk.tar.gz,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.0/I200606150000/emf-sdo-xsd-SDK-I200606150000.zip
672
	# http://download.eclipse.org/downloads/drops/M20060609-1217/eclipse-SDK-M20060609-1217-linux-gtk.tar.gz,http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.0/I200606150000/emf-xsd-SDK-I200606150000.zip
673
	
673
	
674
	export JAVA_HOME=/opt/sun-java2-5.0;
674
	export JAVA_HOME=/opt/sun-java2-5.0;
675
	export ANT_HOME=/opt/apache-ant-1.6;
675
	export ANT_HOME=/opt/apache-ant-1.6;
Lines 805-811 Link Here
805
  if [[ $subprojectName == "emf" ]]; then
805
  if [[ $subprojectName == "emf" ]]; then
806
  	i=0;
806
  	i=0;
807
  	while [[ $i -lt ${#cvsModulesArray[@]} ]]; do
807
  	while [[ $i -lt ${#cvsModulesArray[@]} ]]; do
808
  		# projects[]=cvssrc/projectName-subprojectNamespace (cvssrc/emf-org.eclipse.emf.ecore.sdo) or
808
  		# projects[]=cvssrc/projectName-subprojectNamespace (cvssrc/mdt-org.eclipse.xsd) or
809
  		# projects[]=cvssrc_branches/projectName-subprojectNamespace-cvsbranch (cvssrc_branches/mdt-org.eclipse.xsd-R2_2_maintenance)
809
  		# projects[]=cvssrc_branches/projectName-subprojectNamespace-cvsbranch (cvssrc_branches/mdt-org.eclipse.xsd-R2_2_maintenance)
810
  		if [[ $cvsbranch = "HEAD" ]]; then
810
  		if [[ $cvsbranch = "HEAD" ]]; then
811
    		parsecvsCmd=$parsecvsCmd"projects%5B%5D=cvssrc%2F"${cvsModulesArray[$i]}"&";
811
    		parsecvsCmd=$parsecvsCmd"projects%5B%5D=cvssrc%2F"${cvsModulesArray[$i]}"&";
Lines 890-901 Link Here
890
		
890
		
891
	# EMF Special Case -- EMF + SDO + XSD
891
	# EMF Special Case -- EMF + SDO + XSD
892
	if [ "$subprojectName" = "emf" ]; then 
892
	if [ "$subprojectName" = "emf" ]; then 
893
		relnotesURL="http://build.eclipse.org/modeling/emf/news/relnotes.php?project=sdo&version="$relnotesver"&bugzonly&strict";
894
		echo -n "[promote] Check $relnotesURL ... ";
895
		bugList2=$(curl "$relnotesURL" 2>&1 | egrep "[0-9]{5,6}"); echo -n " found "${bugList2%;*}" bugs: "; bugList2=${bugList2#*;}; echo $bugList2; 
896
		if [[ ! $bugList ]]; then bugList=$bugList2; else bugList=$bugList","$bugList2; fi
897
		bugList2="";
898
		
899
		relnotesURL="http://build.eclipse.org/modeling/mdt/news/relnotes.php?project=xsd&version="$relnotesver"&bugzonly&strict";
893
		relnotesURL="http://build.eclipse.org/modeling/mdt/news/relnotes.php?project=xsd&version="$relnotesver"&bugzonly&strict";
900
		echo -n "[promote] Check $relnotesURL ... ";
894
		echo -n "[promote] Check $relnotesURL ... ";
901
		bugList2=$(curl "$relnotesURL" 2>&1 | egrep "[0-9]{5,6}"); echo -n " found "${bugList2%;*}" bugs: "; bugList2=${bugList2#*;}; echo $bugList2; 
895
		bugList2=$(curl "$relnotesURL" 2>&1 | egrep "[0-9]{5,6}"); echo -n " found "${bugList2%;*}" bugs: "; bugList2=${bugList2#*;}; echo $bugList2; 
(-)scripts/runJDK60Tests.xml (-2 lines)
Lines 179-186 Link Here
179
		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>
179
		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>
180
		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
180
		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
181
		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
181
		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
182
		<buildPlugin pluginid="commonj.sdo" parentid="org.eclipse.emf"/>
183
		<buildPlugin pluginid="ecore.sdo" parentid="org.eclipse.emf"/>
184
		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
182
		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
185
	</target>
183
	</target>
186
184
(-)scripts/runJDK14Tests.xml (-3 lines)
Lines 162-169 Link Here
162
		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>		
162
		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>		
163
		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
163
		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
164
		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
164
		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
165
		<buildPlugin pluginid="commonj.sdo" parentid="org.eclipse.emf"/>
166
		<buildPlugin pluginid="ecore.sdo" parentid="org.eclipse.emf"/>
167
		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
165
		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
168
	</target>
166
	</target>
169
	
167
	
Lines 272-278 Link Here
272
		</macrodef>
270
		</macrodef>
273
		<runTest testclass="org.eclipse.emf.test.core.AllSuites" testPlugin="org.eclipse.emf.test.core"/>
271
		<runTest testclass="org.eclipse.emf.test.core.AllSuites" testPlugin="org.eclipse.emf.test.core"/>
274
		<runTest testclass="org.eclipse.emf.test.edit.AllSuites" testPlugin="org.eclipse.emf.test.edit"/>
272
		<runTest testclass="org.eclipse.emf.test.edit.AllSuites" testPlugin="org.eclipse.emf.test.edit"/>
275
		<runTest testclass="org.eclipse.emf.test.sdo.AllSuites"  testPlugin="org.eclipse.emf.test.sdo"/>
276
		<runTest testclass="org.eclipse.emf.test.xml.AllSuites"  testPlugin="org.eclipse.emf.test.xml"/>
273
		<runTest testclass="org.eclipse.emf.test.xml.AllSuites"  testPlugin="org.eclipse.emf.test.xml"/>
277
	</target>
274
	</target>
278
</project>
275
</project>
(-)scripts/runJDK50Tests.xml (-2 lines)
Lines 179-186 Link Here
179
		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>
179
		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>
180
		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
180
		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
181
		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
181
		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
182
		<buildPlugin pluginid="commonj.sdo" parentid="org.eclipse.emf"/>
183
		<buildPlugin pluginid="ecore.sdo" parentid="org.eclipse.emf"/>
184
		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
182
		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
185
	</target>
183
	</target>
186
184
(-)scripts/runJDK13Tests.sh (-5 / +5 lines)
Lines 8-14 Link Here
8
#X#  -downloadsDir /home/www-data/build/downloads \
8
#X#  -downloadsDir /home/www-data/build/downloads \
9
#X#  -testDir /home/www-data/jdk13tests/2.0.1/N200409162018/200409171711 \
9
#X#  -testDir /home/www-data/jdk13tests/2.0.1/N200409162018/200409171711 \
10
#X#  -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
10
#X#  -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
11
#X#  -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-sdo-xsd-SDK-N200409162018.zip \
11
#X#  -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-xsd-SDK-N200409162018.zip \
12
#X#  -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt 
12
#X#  -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt 
13
13
14
echo [jdk] runJDK13Tests.sh started on: `date +%Y%m%d\ %k\:%M\:%S`
14
echo [jdk] runJDK13Tests.sh started on: `date +%Y%m%d\ %k\:%M\:%S`
Lines 53-59 Link Here
53
	echo "   -downloadsDir /home/www-data/build/downloads \\"
53
	echo "   -downloadsDir /home/www-data/build/downloads \\"
54
	echo "   -testDir /home/www-data/jdk13tests/2.0.1/R200409171617/200409221349 \\"
54
	echo "   -testDir /home/www-data/jdk13tests/2.0.1/R200409171617/200409221349 \\"
55
	echo "   -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161125/eclipse-SDK-3.0.1-linux-gtk.zip \\"
55
	echo "   -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161125/eclipse-SDK-3.0.1-linux-gtk.zip \\"
56
	echo "   -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-sdo-xsd-SDK-2.0.1.zip \\"
56
	echo "   -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-xsd-SDK-2.0.1.zip \\"
57
	echo "   -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
57
	echo "   -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
58
	exit 1
58
	exit 1
59
fi
59
fi
Lines 255-261 Link Here
255
echo "[jdk] unzip Automated-Tests*.zip ... "
255
echo "[jdk] unzip Automated-Tests*.zip ... "
256
unzip -uoj $quietZip $emfTestFile -d $testDir/tests ; 
256
unzip -uoj $quietZip $emfTestFile -d $testDir/tests ; 
257
257
258
emfTestFile="$testDir/tests/emf-sdo-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
258
emfTestFile="$testDir/tests/emf-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
259
echo "[jdk] unzip JUnit-Tests*.zip ... "
259
echo "[jdk] unzip JUnit-Tests*.zip ... "
260
unzip -uo $quietZip $emfTestFile -d $testDir/tests ; 
260
unzip -uo $quietZip $emfTestFile -d $testDir/tests ; 
261
261
Lines 270-276 Link Here
270
}
270
}
271
271
272
# for org.eclipse.emf.test.* ... 
272
# for org.eclipse.emf.test.* ... 
273
for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
273
for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
274
	getTestFolder $pluginSuf; 
274
	getTestFolder $pluginSuf; 
275
	if [ "x$testFolder" != "x" ]; then
275
	if [ "x$testFolder" != "x" ]; then
276
		echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
276
		echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
Lines 286-292 Link Here
286
echo "clean up ..."
286
echo "clean up ..."
287
rm -fr $testDir/tests/eclipse
287
rm -fr $testDir/tests/eclipse
288
288
289
for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
289
for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
290
	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
290
	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
291
		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
291
		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
292
		echo "[jdk] unzip test.$pluginSuf.jar ..."
292
		echo "[jdk] unzip test.$pluginSuf.jar ..."
(-)scripts/runJDK13Tests.xml (-2 lines)
Lines 148-155 Link Here
148
		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>
148
		<buildPlugin pluginid="ecore" parentid="org.eclipse.emf"/>
149
		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
149
		<buildPlugin pluginid="ecore.xmi" parentid="org.eclipse.emf"/>
150
		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
150
		<buildPlugin pluginid="ecore.change" parentid="org.eclipse.emf"/>
151
		<buildPlugin pluginid="commonj.sdo" parentid="org.eclipse.emf"/>
152
		<buildPlugin pluginid="ecore.sdo" parentid="org.eclipse.emf"/>
153
		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
151
		<buildPlugin pluginid="xsd" parentid="org.eclipse"/>
154
	</target>
152
	</target>
155
153
(-)scripts/adjustCVS.sh (-2 / +1 lines)
Lines 182-188 Link Here
182
	
182
	
183
if [ $tagBuild != 'false' ]; then
183
if [ $tagBuild != 'false' ]; then
184
	command="cvs -q rtag -r $branchCVS $buildTag"; # rtag sources
184
	command="cvs -q rtag -r $branchCVS $buildTag"; # rtag sources
185
	command=$command" org.eclipse.emf/org.eclipse.emf org.eclipse.emf/org.eclipse.emf.ecore.sdo org.eclipse.mdt/org.eclipse.xsd"
185
	command=$command" org.eclipse.emf/org.eclipse.emf org.eclipse.mdt/org.eclipse.xsd"
186
	$baseDir/scripts/executeCommand.sh "$command"
186
	$baseDir/scripts/executeCommand.sh "$command"
187
fi
187
fi
188
188
Lines 266-272 Link Here
266
266
267
# regenerate all feature.xml files
267
# regenerate all feature.xml files
268
$baseDir/scripts/genFeatureSDK.sh -repoInfoFile $repoInfoFile -baseProject org.eclipse.emf -baseFeatureID org.eclipse.emf
268
$baseDir/scripts/genFeatureSDK.sh -repoInfoFile $repoInfoFile -baseProject org.eclipse.emf -baseFeatureID org.eclipse.emf
269
$baseDir/scripts/genFeatureSDK.sh -repoInfoFile $repoInfoFile -baseProject org.eclipse.emf -baseFeatureID org.eclipse.emf.ecore.sdo
270
$baseDir/scripts/genFeatureSDK.sh -repoInfoFile $repoInfoFile -baseProject org.eclipse.mdt -baseFeatureID org.eclipse.xsd
269
$baseDir/scripts/genFeatureSDK.sh -repoInfoFile $repoInfoFile -baseProject org.eclipse.mdt -baseFeatureID org.eclipse.xsd
271
270
272
# Checking in and tagging the files
271
# Checking in and tagging the files
(-)scripts/NLpacks2nlzip.sh (-3 lines)
Lines 6-12 Link Here
6
# nl.zip!/emf.ecore/org/eclipse/emf/ecore/plugin/plugin_fr.properties
6
# nl.zip!/emf.ecore/org/eclipse/emf/ecore/plugin/plugin_fr.properties
7
# nl.zip!/emf.ecore.change.edit/org/eclipse/emf/ecore/change/provider/plugin_fr.properties
7
# nl.zip!/emf.ecore.change.edit/org/eclipse/emf/ecore/change/provider/plugin_fr.properties
8
# nl.zip!/emf.ecore.edit/org/eclipse/emf/ecore/provider/plugin_fr.properties
8
# nl.zip!/emf.ecore.edit/org/eclipse/emf/ecore/provider/plugin_fr.properties
9
# nl.zip!/emf.ecore.sdo.edit/org/eclipse/emf/ecore/sdo/provider/plugin_fr.properties
10
# nl.zip!/emf.edit/org/eclipse/emf/edit/plugin_fr.properties
9
# nl.zip!/emf.edit/org/eclipse/emf/edit/plugin_fr.properties
11
# nl.zip!/xsd/org/eclipse/xsd/plugin_fr.properties
10
# nl.zip!/xsd/org/eclipse/xsd/plugin_fr.properties
12
# nl.zip!/xsd.edit/org/eclipse/xsd/provider/plugin_fr.properties
11
# nl.zip!/xsd.edit/org/eclipse/xsd/provider/plugin_fr.properties
Lines 68-74 Link Here
68
"org.eclipse.emf.ecore.nl"
67
"org.eclipse.emf.ecore.nl"
69
"org.eclipse.emf.ecore.change.edit.nl"
68
"org.eclipse.emf.ecore.change.edit.nl"
70
"org.eclipse.emf.ecore.edit.nl"
69
"org.eclipse.emf.ecore.edit.nl"
71
"org.eclipse.emf.ecore.sdo.edit.nl"     
72
"org.eclipse.emf.edit.nl"
70
"org.eclipse.emf.edit.nl"
73
71
74
"org.eclipse.xsd.nl"
72
"org.eclipse.xsd.nl"
Lines 83-89 Link Here
83
"emf.ecore/org/eclipse/emf/ecore/plugin/"
81
"emf.ecore/org/eclipse/emf/ecore/plugin/"
84
"emf.ecore.change.edit/org/eclipse/emf/ecore/change/provider/"
82
"emf.ecore.change.edit/org/eclipse/emf/ecore/change/provider/"
85
"emf.ecore.edit/org/eclipse/emf/ecore/provider/"
83
"emf.ecore.edit/org/eclipse/emf/ecore/provider/"
86
"emf.ecore.sdo.edit/org/eclipse/emf/ecore/sdo/provider/"
87
"emf.edit/org/eclipse/emf/edit/"
84
"emf.edit/org/eclipse/emf/edit/"
88
85
89
"xsd/org/eclipse/xsd/"
86
"xsd/org/eclipse/xsd/"
(-)scripts/createMapAndTestManifestFile.pl (-3 lines)
Lines 72-80 Link Here
72
	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf/examples/*";
72
	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf/examples/*";
73
	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf/tests/*";
73
	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf/tests/*";
74
	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf/doc/*";
74
	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf/doc/*";
75
	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/*";
76
	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/*";
77
	$command .= " && ls -d org.eclipse.emf/org.eclipse.emf.ecore.sdo/doc/*";
78
	$command .= " && ls -d org.eclipse.mdt/org.eclipse.xsd/features/*";
75
	$command .= " && ls -d org.eclipse.mdt/org.eclipse.xsd/features/*";
79
	$command .= " && ls -d org.eclipse.mdt/org.eclipse.xsd/plugins/*";
76
	$command .= " && ls -d org.eclipse.mdt/org.eclipse.xsd/plugins/*";
80
	$command .= " && ls -d org.eclipse.mdt/org.eclipse.xsd/doc/*";
77
	$command .= " && ls -d org.eclipse.mdt/org.eclipse.xsd/doc/*";
(-)scripts/purgeCVSTag.sh (-1 / +1 lines)
Lines 10-16 Link Here
10
delete=0;
10
delete=0;
11
user=$USER;
11
user=$USER;
12
proj="emf"
12
proj="emf"
13
modules="org.eclipse.emf/org.eclipse.emf org.eclipse.emf/org.eclipse.emf.ecore.sdo org.eclipse.emf/org.eclipse.emf.releng org.eclipse.mdt/org.eclipse.xsd";
13
modules="org.eclipse.emf/org.eclipse.emf org.eclipse.emf/org.eclipse.emf.releng org.eclipse.mdt/org.eclipse.xsd";
14
14
15
if [ $# -lt 1 ]; then
15
if [ $# -lt 1 ]; then
16
	echo " "
16
	echo " "
(-)scripts/start.sh (-7 / +7 lines)
Lines 429-435 Link Here
429
if [[ $depsFile != "" ]]; then
429
if [[ $depsFile != "" ]]; then
430
	if [[ -f $depsFile ]]; then
430
	if [[ -f $depsFile ]]; then
431
		depNum=$(cat $depsFile | grep "$subprojectName=" | tail -1); depNum=${depNum%%$subprojectName=*};
431
		depNum=$(cat $depsFile | grep "$subprojectName=" | tail -1); depNum=${depNum%%$subprojectName=*};
432
		SDKURL=$(find $buildDir -maxdepth 1 -name "emf-sdo-xsd-SDK-*.zip" | tail -1);
432
		SDKURL=$(find $buildDir -maxdepth 1 -name "emf-xsd-SDK-*.zip" | tail -1);
433
		if [[ $SDKURL != "" ]]; then 
433
		if [[ $SDKURL != "" ]]; then 
434
			SDKURL=${SDKURL##$buildDir}; SDKURL=${SDKURL##*/}; 
434
			SDKURL=${SDKURL##$buildDir}; SDKURL=${SDKURL##*/}; 
435
			SDKURL=http://$hostname/modeling/$projectName/$subprojectName/downloads/drops/$version/$buildType$buildTimestamp/$SDKURL; 
435
			SDKURL=http://$hostname/modeling/$projectName/$subprojectName/downloads/drops/$version/$buildType$buildTimestamp/$SDKURL; 
Lines 508-514 Link Here
508
	 -downloadsDir /home/www-data/build/downloads \
508
	 -downloadsDir /home/www-data/build/downloads \
509
	 -testDir $testPath/$runJDK13Tests/$buildType$buildTimestamp/$testTimestamp \
509
	 -testDir $testPath/$runJDK13Tests/$buildType$buildTimestamp/$testTimestamp \
510
	 -eclipseURL $dependURL \
510
	 -eclipseURL $dependURL \
511
	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDK13Tests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
511
	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDK13Tests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
512
	 -email $email \
512
	 -email $email \
513
	 >> $testPath/$runJDK13Tests/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
513
	 >> $testPath/$runJDK13Tests/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
514
	echo "[start] about to run the following:";
514
	echo "[start] about to run the following:";
Lines 542-555 Link Here
542
	fi
542
	fi
543
543
544
	# can't comment code within a string-block... removed to here.
544
	# can't comment code within a string-block... removed to here.
545
	#	 -emfURL http://emf.torolab.ibm.com/modeling/emf/downloads/drops/$runJDK14Tests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
545
	#	 -emfURL http://emf.torolab.ibm.com/modeling/emf/downloads/drops/$runJDK14Tests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
546
546
547
	cmd="/bin/bash -c ' \
547
	cmd="/bin/bash -c ' \
548
	 exec /usr/bin/nohup /usr/bin/setsid /home/www-data/build/emf/scripts/runJDK14Tests.sh \
548
	 exec /usr/bin/nohup /usr/bin/setsid /home/www-data/build/emf/scripts/runJDK14Tests.sh \
549
	 -downloadsDir /home/www-data/build/downloads \
549
	 -downloadsDir /home/www-data/build/downloads \
550
	 -testDir $testPath/$runJDK14Tests/$buildType$buildTimestamp/$testTimestamp \
550
	 -testDir $testPath/$runJDK14Tests/$buildType$buildTimestamp/$testTimestamp \
551
	 -eclipseURL $dependURL \
551
	 -eclipseURL $dependURL \
552
	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDK14Tests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
552
	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDK14Tests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
553
	 -email $email \
553
	 -email $email \
554
	 >> $testPath/$runJDK14Tests/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
554
	 >> $testPath/$runJDK14Tests/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
555
	echo "[start] about to run the following:";
555
	echo "[start] about to run the following:";
Lines 586-592 Link Here
586
	fi
586
	fi
587
587
588
	# can't comment code within a string-block... removed to here.
588
	# can't comment code within a string-block... removed to here.
589
	#	 -emfURL http://emf.torolab.ibm.com/modeling/emf/downloads/drops/$runJDK50Tests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
589
	#	 -emfURL http://emf.torolab.ibm.com/modeling/emf/downloads/drops/$runJDK50Tests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
590
	#    -compilerArgSource 1.5 \
590
	#    -compilerArgSource 1.5 \
591
	#    -compilerArgXlint all \
591
	#    -compilerArgXlint all \
592
592
Lines 595-601 Link Here
595
	 -downloadsDir /home/www-data/build/downloads \
595
	 -downloadsDir /home/www-data/build/downloads \
596
	 -testDir $testPath/$runJDKTestsID/$buildType$buildTimestamp/$testTimestamp \
596
	 -testDir $testPath/$runJDKTestsID/$buildType$buildTimestamp/$testTimestamp \
597
	 -eclipseURL $dependURL \
597
	 -eclipseURL $dependURL \
598
	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDKTestsID/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
598
	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runJDKTestsID/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
599
	 -email $email \
599
	 -email $email \
600
	 >> $testPath/$runJDKTestsID/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
600
	 >> $testPath/$runJDKTestsID/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
601
	echo "[start] about to run the following:";
601
	echo "[start] about to run the following:";
Lines 637-643 Link Here
637
	 -downloadsDir /home/www-data/build/downloads \
637
	 -downloadsDir /home/www-data/build/downloads \
638
	 -testDir $testPath/$runOldTests/$buildType$buildTimestamp/$testTimestamp \
638
	 -testDir $testPath/$runOldTests/$buildType$buildTimestamp/$testTimestamp \
639
	 -eclipseURL $dependURL \
639
	 -eclipseURL $dependURL \
640
	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runOldTests/$buildType$buildTimestamp/emf-sdo-xsd-SDK-$buildID.zip \
640
	 -emfFile /home/www-data/build/modeling/emf/$proj/downloads/drops/$runOldTests/$buildType$buildTimestamp/emf-xsd-SDK-$buildID.zip \
641
	 -emfOldTestsBranch $emfOldTestsBranch \
641
	 -emfOldTestsBranch $emfOldTestsBranch \
642
	 -email $email \
642
	 -email $email \
643
	 >> $testPath/$runOldTests/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
643
	 >> $testPath/$runOldTests/$buildType$buildTimestamp/$testTimestamp/testlog.txt 2>&1 & ' ;"
(-)scripts/promoteToEclipse.emf.properties (-8 / +8 lines)
Lines 7-18 Link Here
7
projectNameVanity=`echo $subprojectName | tr "a-z" "A-Z"`; # or something else manually assigned
7
projectNameVanity=`echo $subprojectName | tr "a-z" "A-Z"`; # or something else manually assigned
8
8
9
# used to determine the actual name of the SDK zip (when builds are aliased)
9
# used to determine the actual name of the SDK zip (when builds are aliased)
10
SDKfilenamepattern="emf-sdo-xsd-SDK-*.zip"
10
SDKfilenamepattern="emf-xsd-SDK-*.zip"
11
11
12
# used for updating Search CVS database, eg: 
12
# used for updating Search CVS database, eg: 
13
# http://build.eclipse.org/modeling/build/updateSearchCVS.php?projects%5B%5D=cvssrc%2Femf-org.eclipse.emf&projects%5B%5D=cvssrc%2Femf-org.eclipse.emf.ecore.sdo&projects%5B%5D=cvssrc2Femf-org.eclipse.xsd
13
# http://build.eclipse.org/modeling/build/updateSearchCVS.php?projects%5B%5D=cvssrc%2Femf-org.eclipse.emf&projects%5B%5D=cvssrc2Femf-org.eclipse.xsd
14
# http://build.eclipse.org/modeling/build/updateSearchCVS.php?projects%5B%5D=cvssrc_branches%2Femf-org.eclipse.emf-R2_2_maintenance&projects%5B%5D=cvssrc_branches%2Femf-org.eclipse.emf.ecore.sdo-R2_2_maintenance&projects%5B%5D=cvssrc_branches2Femf-org.eclipse.xsd-R2_2_maintenance
14
# http://build.eclipse.org/modeling/build/updateSearchCVS.php?projects%5B%5D=cvssrc_branches%2Femf-org.eclipse.emf-R2_2_maintenance&projects%5B%5D=cvssrc_branches2Femf-org.eclipse.xsd-R2_2_maintenance
15
cvsModulesArray=( "emf-org.eclipse.emf" "emf-org.eclipse.emf.ecore.sdo" "mdt-org.eclipse.xsd" );
15
cvsModulesArray=( "emf-org.eclipse.emf" "mdt-org.eclipse.xsd" );
16
16
17
# the following two arrays must be the same size (or else the second one will default to blank)
17
# the following two arrays must be the same size (or else the second one will default to blank)
18
javadocModuleArray=( "$projectName-$subprojectName" ); # array, project-subproject, for the name of the zip scp'd to remote, eg. foo-bar-doc.zip
18
javadocModuleArray=( "$projectName-$subprojectName" ); # array, project-subproject, for the name of the zip scp'd to remote, eg. foo-bar-doc.zip
Lines 141-148 Link Here
141
vm=$javaHome/bin/java
141
vm=$javaHome/bin/java
142
142
143
# zips to unpack for UM jar generation
143
# zips to unpack for UM jar generation
144
filePrefixesToUnzipArray=( "emf-sdo-xsd-Master-" );
144
filePrefixesToUnzipArray=( "emf-xsd-Master-" );
145
#filePrefixesToUnzipArray=( "emf-sdo-xsd-SDK-" "emf-sdo-xsd-Examples-" );
145
#filePrefixesToUnzipArray=( "emf-xsd-SDK-" "emf-xsd-Examples-" );
146
146
147
# additional (optional) properties for use with update site category generation; must be in quotes 
147
# additional (optional) properties for use with update site category generation; must be in quotes 
148
updateSiteSDKName="EMF SDK"
148
updateSiteSDKName="EMF SDK"
Lines 177-182 Link Here
177
coordsiteBranch=HEAD
177
coordsiteBranch=HEAD
178
178
179
# pattern to use when searching for features to include in coordsite; defaults to ".*eclipse/features/org.eclipse..*(${subprojectName}|${subprojectName}.sdk)_.*\/$" 
179
# pattern to use when searching for features to include in coordsite; defaults to ".*eclipse/features/org.eclipse..*(${subprojectName}|${subprojectName}.sdk)_.*\/$" 
180
coordsiteFeaturePattern=".*eclipse/features/org.eclipse..*(emf|emf.sdk|xsd|xsd.sdk|emf.ecore.sdo|emf.ecore.sdo.sdk|emf.common|emf.common.ui|emf.ecore|emf.ecore.edit|emf.edit|emf.edit.ui|xsd.edit)_.*\/$"
180
coordsiteFeaturePattern=".*eclipse/features/org.eclipse..*(emf|emf.sdk|xsd|xsd.sdk|emf.common|emf.common.ui|emf.ecore|emf.ecore.edit|emf.edit|emf.edit.ui|xsd.edit)_.*\/$"
181
# pattern to use when setting feature to include in coordsite's main feature ('Models and Model Development'); all other matching features will go in 'Enabling Features'
181
# pattern to use when setting feature to include in coordsite's main feature ('Models and Model Development'); all other matching features will go in 'Enabling Features'
182
coordsiteMainFeaturePattern="org.eclipse.(emf|emf.sdk|xsd|xsd.sdk|emf.ecore.sdo|emf.ecore.sdo.sdk)$"
182
coordsiteMainFeaturePattern="org.eclipse.(emf|emf.sdk|xsd|xsd.sdk)$"
(-)scripts/runJDK60Tests.sh (-6 / +6 lines)
Lines 5-11 Link Here
5
#X#  -downloadsDir /home/www-data/build/downloads \
5
#X#  -downloadsDir /home/www-data/build/downloads \
6
#X#  -testDir /home/www-data/jdk60tests/2.0.1/N200409162018/200409171711 \
6
#X#  -testDir /home/www-data/jdk60tests/2.0.1/N200409162018/200409171711 \
7
#X#  -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
7
#X#  -eclipseURL http://download2.eclipse.org/downloads/drops/M-M20040915-200409151412/eclipse-SDK-M20040915-linux-gtk.zip \
8
#X#  -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-sdo-xsd-SDK-N200409162018.zip \
8
#X#  -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/N200409162018/emf-xsd-SDK-N200409162018.zip \
9
#X#  -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt
9
#X#  -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_`date +%Y%m%d%H\:%M\:%S`.txt
10
10
11
ver=6;
11
ver=6;
Lines 63-69 Link Here
63
	echo "   -downloadsDir /home/www-data/build/downloads \\"
63
	echo "   -downloadsDir /home/www-data/build/downloads \\"
64
	echo "   -testDir /home/www-data/jdk${ver}0tests/2.0.1/R200409171617/200409221349 \\"
64
	echo "   -testDir /home/www-data/jdk${ver}0tests/2.0.1/R200409171617/200409221349 \\"
65
	echo "   -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161129/eclipse-SDK-3.0.1-linux-gtk.zip \\"
65
	echo "   -eclipseURL http://fullmoon.torolab.ibm.com/downloads/drops/R-3.0.1-200409161129/eclipse-SDK-3.0.1-linux-gtk.zip \\"
66
	echo "   -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-sdo-xsd-SDK-2.0.1.zip \\"
66
	echo "   -emfFile /home/www-data/build/emf/downloads/drops/2.0.1/R200409171617/emf-xsd-SDK-2.0.1.zip \\"
67
	echo "   -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
67
	echo "   -email codeslave@ca.ibm.com 2>&1 | tee ~/logs/jdk_testlog_\`date +%Y%m%d%H\:%M\:%S\`.txt "
68
	exit 1
68
	exit 1
69
fi
69
fi
Lines 283-289 Link Here
283
echo "[jdk] 1/2 unzip Automated-Tests*.zip ... "
283
echo "[jdk] 1/2 unzip Automated-Tests*.zip ... "
284
unzip -uoj $quietZip $emfTestFile -d $testDir/tests ;
284
unzip -uoj $quietZip $emfTestFile -d $testDir/tests ;
285
285
286
emfTestFile="$testDir/tests/emf-sdo-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
286
emfTestFile="$testDir/tests/emf-xsd-JUnit-Tests-*.zip";		#echo "[jdk] $emfTestFile";
287
echo "[jdk] 2/2 unzip JUnit-Tests*.zip ... "
287
echo "[jdk] 2/2 unzip JUnit-Tests*.zip ... "
288
unzip -uo $quietZip $emfTestFile -d $testDir/tests ;
288
unzip -uo $quietZip $emfTestFile -d $testDir/tests ;
289
289
Lines 298-304 Link Here
298
}
298
}
299
299
300
# for org.eclipse.emf.test.* ...
300
# for org.eclipse.emf.test.* ...
301
for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
301
for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
302
	getTestFolder $pluginSuf;
302
	getTestFolder $pluginSuf;
303
	if [ "x$testFolder" != "x" ]; then
303
	if [ "x$testFolder" != "x" ]; then
304
		#echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
304
		#echo "[jdk] renaming $testFolder to org.eclipse.emf.test.$pluginSuf ..."
Lines 314-320 Link Here
314
echo "clean up ..."
314
echo "clean up ..."
315
rm -fr $testDir/tests/eclipse
315
rm -fr $testDir/tests/eclipse
316
316
317
for pluginSuf in "build" "core" "edit" "sdo" "tools" "xml" ; do
317
for pluginSuf in "build" "core" "edit" "tools" "xml" ; do
318
	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
318
	if [ -d $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ]; then
319
		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
319
		cd $testDir/eclipse/plugins/org.eclipse.emf.test.$pluginSuf/ ;
320
		#echo "[jdk] unzip test.$pluginSuf.jar ..."
320
		#echo "[jdk] unzip test.$pluginSuf.jar ..."
Lines 333-339 Link Here
333
export PLUGINS_DIR=$ECLIPSE_DIR/plugins
333
export PLUGINS_DIR=$ECLIPSE_DIR/plugins
334
334
335
# check to see what JDK was used for the actual build
335
# check to see what JDK was used for the actual build
336
#eg., for emfFile=/home/www-data/build/emf/tools/emf/downloads/drops/2.3.0/N200612201119/emf-sdo-SDK-N200612201119.zip
336
#eg., for emfFile=/home/www-data/build/emf/tools/emf/downloads/drops/2.3.0/N200612201119/emf-SDK-N200612201119.zip
337
buildJava=$(grep "javaHome=" ${emfFile%/*}/build.cfg | tail -1); buildJava=${buildJava#*=}; # echo $buildJava
337
buildJava=$(grep "javaHome=" ${emfFile%/*}/build.cfg | tail -1); buildJava=${buildJava#*=}; # echo $buildJava
338
338
339
if [[ true ]]; then
339
if [[ true ]]; then
(-)scripts/doc2jar.sh (-2 / +2 lines)
Lines 20-27 Link Here
20
	echo "  <REQUIRED: path to SDK zip to unpack> \\"
20
	echo "  <REQUIRED: path to SDK zip to unpack> \\"
21
	echo "  <OPTIONAL: path to unpack zip - defaults to \".\"> \\"
21
	echo "  <OPTIONAL: path to unpack zip - defaults to \".\"> \\"
22
	echo "  <OPTIONAL: filter to search - defaults to \"$filter\">"
22
	echo "  <OPTIONAL: filter to search - defaults to \"$filter\">"
23
	echo "Example: doc2jar -z ./2.1.2/R200601191349/emf-sdo-xsd-SDK-2.1.2.zip"
23
	echo "Example: doc2jar -z ./2.1.2/R200601191349/emf-xsd-SDK-2.1.2.zip"
24
	echo "Example: doc2jar -z ./2.1.2/R200601191349/emf-sdo-xsd-SDK-2.1.2.zip ~/foo *doc*"
24
	echo "Example: doc2jar -z ./2.1.2/R200601191349/emf-xsd-SDK-2.1.2.zip ~/foo *doc*"
25
	exit;
25
	exit;
26
fi
26
fi
27
27
(-)scripts/start_cron.sh (-7 / +7 lines)
Lines 4-14 Link Here
4
# EMF only
4
# EMF only
5
#00 15 * * 2 sudo -u www-data /home/www-data/build/emf/scripts/start_cron.sh -sub emf -runJDK50Tests -regex "[ISR]200.*/eclipse-SDK-" -basebuilderBranch M1_34 -n -a > $HOME/cron_logs/start_cron.sh.emf.24N.txt 2>&1
5
#00 15 * * 2 sudo -u www-data /home/www-data/build/emf/scripts/start_cron.sh -sub emf -runJDK50Tests -regex "[ISR]200.*/eclipse-SDK-" -basebuilderBranch M1_34 -n -a > $HOME/cron_logs/start_cron.sh.emf.24N.txt 2>&1
6
# U/O/QTV N builds: uml2 (20-25), ocl (10-15), query (5-10), validation (7-10), transaction (12-15)
6
# U/O/QTV N builds: uml2 (20-25), ocl (10-15), query (5-10), validation (7-10), transaction (12-15)
7
#00 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub uml2 -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-sdo-xsd-SDK-" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.uml2.N.txt 2>&1
7
#00 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub uml2 -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-xsd-SDK-" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.uml2.N.txt 2>&1
8
#25 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub ocl -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-sdo-xsd-SDK-|[ISR]200.*/mdt-uml2-SDK|orbit" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.ocl.N.txt 2>&1
8
#25 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub ocl -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-xsd-SDK-|[ISR]200.*/mdt-uml2-SDK|orbit" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.ocl.N.txt 2>&1
9
#40 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub query -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-sdo-xsd-SDK-|[S]200.*mdt-ocl-SDK-" -basebuilderBranch v20071030 -n > $HOME/cron_logs/start_cron.sh.query.N.txt 2>&1
9
#40 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub query -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-xsd-SDK-|[S]200.*mdt-ocl-SDK-" -basebuilderBranch v20071030 -n > $HOME/cron_logs/start_cron.sh.query.N.txt 2>&1
10
#50 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub validation -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*emf-sdo-xsd-SDK-|[S]200.*mdt-ocl-SDK-" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.validation.N.txt 2>&1
10
#50 18 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub validation -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*emf-xsd-SDK-|[S]200.*mdt-ocl-SDK-" -basebuilderBranch v20071030 -n -a > $HOME/cron_logs/start_cron.sh.validation.N.txt 2>&1
11
#00 19 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub transaction -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-sdo-xsd-SDK-|[ISR]200.*/emf-validation-SDK-" -basebuilderBranch v20071030 -nosearchcvs > $HOME/cron_logs/start_cron.sh.transaction.N.txt 2>&1
11
#00 19 * * 2 sudo -u www-data /home/www-data/build/modeling/scripts/start_cron.sh -sub transaction -regex "[ISR]200.*/eclipse-SDK-|[ISR]200.*/emf-xsd-SDK-|[ISR]200.*/emf-validation-SDK-" -basebuilderBranch v20071030 -nosearchcvs > $HOME/cron_logs/start_cron.sh.transaction.N.txt 2>&1
12
12
13
###### ###### ###### ###### ###### ###### INSTRUCTIONS & OPTIONS ###### ###### ###### ###### ###### ###### 
13
###### ###### ###### ###### ###### ###### INSTRUCTIONS & OPTIONS ###### ###### ###### ###### ###### ###### 
14
14
Lines 32-38 Link Here
32
	echo ""
32
	echo ""
33
	echo -e "-d, -URL           <optional: list of ${yellow}type${norm}=${yellow}URL${norm} pairs for hardcoding dependencies, if you want to build with something older than"
33
	echo -e "-d, -URL           <optional: list of ${yellow}type${norm}=${yellow}URL${norm} pairs for hardcoding dependencies, if you want to build with something older than"
34
	echo -e "                    the latest in the list). Enter one -d [...] per required ${yellow}type${norm}=${yellow}URL${norm} pair, "
34
	echo -e "                    the latest in the list). Enter one -d [...] per required ${yellow}type${norm}=${yellow}URL${norm} pair, "
35
	echo -e "                    eg., -d ${yellow}emf${norm}=${yellow}http://archive.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/emf-sdo-xsd-SDK-2.3.0.zip${norm} >"
35
	echo -e "                    eg., -d ${yellow}emf${norm}=${yellow}http://archive.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/emf-xsd-SDK-2.3.0.zip${norm} >"
36
	echo "-a, -addSDK        <optional: if used, add the resulting SDK zip to the dependencies file for use with other builds>"
36
	echo "-a, -addSDK        <optional: if used, add the resulting SDK zip to the dependencies file for use with other builds>"
37
	echo "-l, -listDeps      <optional: if used, list the contents of the dependencies file instead of running a build>"
37
	echo "-l, -listDeps      <optional: if used, list the contents of the dependencies file instead of running a build>"
38
	echo ""
38
	echo ""
Lines 297-303 Link Here
297
297
298
	if [[ $searchCVSModules == "" ]]; then
298
	if [[ $searchCVSModules == "" ]]; then
299
		if [[ $subprojectName == "emf" ]]; then 
299
		if [[ $subprojectName == "emf" ]]; then 
300
			searchCVSModules="emf.emf,emf.ecore.sdo,mdt.xsd,emf.releng"; # special case default for EMF
300
			searchCVSModules="emf.emf,mdt.xsd,emf.releng"; # special case default for EMF
301
		else
301
		else
302
			searchCVSModules=$projectName"."$subprojectName","$projectName"."$subprojectName".releng"; # all others default to proj.sub,proj.sub.releng
302
			searchCVSModules=$projectName"."$subprojectName","$projectName"."$subprojectName".releng"; # all others default to proj.sub,proj.sub.releng
303
		fi
303
		fi
(-)builder/tests/customTargets.xml (-6 / +6 lines)
Lines 18-24 Link Here
18
	<!-- ===================================================================== -->
18
	<!-- ===================================================================== -->
19
19
20
	<target name="assemble.org.eclipse.emf.tests">
20
	<target name="assemble.org.eclipse.emf.tests">
21
		<property name="archiveName" value="emf-sdo-xsd-JUnit-Tests-${buildAlias}.zip" />
21
		<property name="archiveName" value="emf-xsd-JUnit-Tests-${buildAlias}.zip" />
22
		<ant antfile="${assembleScriptName}" />
22
		<ant antfile="${assembleScriptName}" />
23
		<!-- ADD POST STEPS -->
23
		<!-- ADD POST STEPS -->
24
	</target>
24
	</target>
Lines 193-199 Link Here
193
		<mkdir dir="${workingDirectory}/eclipse/dropins/eclipse/" />
193
		<mkdir dir="${workingDirectory}/eclipse/dropins/eclipse/" />
194
		<unzip dest="${workingDirectory}/eclipse/dropins/" overwrite="true">
194
		<unzip dest="${workingDirectory}/eclipse/dropins/" overwrite="true">
195
			<fileset dir="${buildDirectory}/${buildLabel}">
195
			<fileset dir="${buildDirectory}/${buildLabel}">
196
				<include name="**/emf-sdo-xsd-JUnit-Tests-*.zip" />
196
				<include name="**/emf-xsd-JUnit-Tests-*.zip" />
197
			</fileset>
197
			</fileset>
198
		</unzip>
198
		</unzip>
199
199
Lines 225-231 Link Here
225
		<delete dir="${workingDirectory}/eclipse/dropins/eclipse/plugins/${org.eclipse.test}" includeEmptyDirs="true" />
225
		<delete dir="${workingDirectory}/eclipse/dropins/eclipse/plugins/${org.eclipse.test}" includeEmptyDirs="true" />
226
226
227
		<!-- rezip the JUnit plugin tests -->
227
		<!-- rezip the JUnit plugin tests -->
228
		<zip destfile="${workingDirectory}/testing/emf-sdo-xsd-JUnit-Tests-${buildAlias}.zip">
228
		<zip destfile="${workingDirectory}/testing/emf-xsd-JUnit-Tests-${buildAlias}.zip">
229
			<zipfileset dir="${workingDirectory}/eclipse/dropins/eclipse" prefix="eclipse" />
229
			<zipfileset dir="${workingDirectory}/eclipse/dropins/eclipse" prefix="eclipse" />
230
		</zip>
230
		</zip>
231
231
Lines 244-255 Link Here
244
		<chmod file="${workingDirectory}/testing/runtests" perm="755" />
244
		<chmod file="${workingDirectory}/testing/runtests" perm="755" />
245
245
246
		<!--create zip file of the automated testing framework-->
246
		<!--create zip file of the automated testing framework-->
247
		<zip destfile="${buildDirectory}/${buildLabel}/emf-sdo-xsd-Automated-Tests-${buildAlias}.zip">
247
		<zip destfile="${buildDirectory}/${buildLabel}/emf-xsd-Automated-Tests-${buildAlias}.zip">
248
			<zipfileset dir="${workingDirectory}/testing" prefix="testing" />
248
			<zipfileset dir="${workingDirectory}/testing" prefix="testing" />
249
		</zip>
249
		</zip>
250
		<!-- <copy todir="/tmp" file="${buildDirectory}/${buildLabel}/emf-sdo-xsd-Automated-Tests-${buildAlias}.zip"/> -->
250
		<!-- <copy todir="/tmp" file="${buildDirectory}/${buildLabel}/emf-xsd-Automated-Tests-${buildAlias}.zip"/> -->
251
251
252
		<delete file="${buildDirectory}/${buildLabel}/emf-sdo-xsd-JUnit-Tests-${buildAlias}.zip" />
252
		<delete file="${buildDirectory}/${buildLabel}/emf-xsd-JUnit-Tests-${buildAlias}.zip" />
253
	</target>
253
	</target>
254
254
255
	<!-- ===================================================================== -->
255
	<!-- ===================================================================== -->
(-)maps/emf.map (-11 lines)
Lines 84-90 Link Here
84
plugin@org.eclipse.emf.test.examples=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.examples
84
plugin@org.eclipse.emf.test.examples=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.examples
85
plugin@org.eclipse.emf.test.performance=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.performance
85
plugin@org.eclipse.emf.test.performance=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.performance
86
plugin@org.eclipse.emf.tests=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.tests
86
plugin@org.eclipse.emf.tests=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.tests
87
plugin@org.eclipse.emf.test.sdo=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.sdo
88
feature@org.eclipse.emf.tests=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.tests-feature
87
feature@org.eclipse.emf.tests=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.tests-feature
89
plugin@org.eclipse.emf.test.tools=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools
88
plugin@org.eclipse.emf.test.tools=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools
90
plugin@org.eclipse.emf.test.xml=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.xml
89
plugin@org.eclipse.emf.test.xml=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.xml
Lines 92-107 Link Here
92
plugin@org.eclipse.emf.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/doc/org.eclipse.emf.doc
91
plugin@org.eclipse.emf.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/doc/org.eclipse.emf.doc
93
feature@org.eclipse.emf.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/doc/org.eclipse.emf.doc-feature
92
feature@org.eclipse.emf.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/doc/org.eclipse.emf.doc-feature
94
plugin@org.eclipse.emf.examples.jet.article2=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/doc/org.eclipse.emf.examples.jet.article2
93
plugin@org.eclipse.emf.examples.jet.article2=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf/doc/org.eclipse.emf.examples.jet.article2
95
feature@org.eclipse.emf.ecore.sdo.edit=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/org.eclipse.emf.ecore.sdo.edit-feature
96
feature@org.eclipse.emf.ecore.sdo.editor=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/org.eclipse.emf.ecore.sdo.editor-feature
97
feature@org.eclipse.emf.ecore.sdo=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/org.eclipse.emf.ecore.sdo-feature
98
feature@org.eclipse.emf.ecore.sdo.sdk=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/features/org.eclipse.emf.ecore.sdo.sdk-feature
99
plugin@org.eclipse.emf.commonj.sdo=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/org.eclipse.emf.commonj.sdo
100
plugin@org.eclipse.emf.ecore.sdo=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/org.eclipse.emf.ecore.sdo
101
plugin@org.eclipse.emf.ecore.sdo.edit=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/org.eclipse.emf.ecore.sdo.edit
102
plugin@org.eclipse.emf.ecore.sdo.editor=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/plugins/org.eclipse.emf.ecore.sdo.editor
103
plugin@org.eclipse.emf.ecore.sdo.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/doc/org.eclipse.emf.ecore.sdo.doc
104
feature@org.eclipse.emf.ecore.sdo.doc=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.emf/org.eclipse.emf.ecore.sdo/doc/org.eclipse.emf.ecore.sdo.doc-feature
105
feature@org.eclipse.xsd.ecore.converter=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.mdt/org.eclipse.xsd/features/org.eclipse.xsd.ecore.converter-feature
94
feature@org.eclipse.xsd.ecore.converter=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.mdt/org.eclipse.xsd/features/org.eclipse.xsd.ecore.converter-feature
106
feature@org.eclipse.xsd.edit=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.mdt/org.eclipse.xsd/features/org.eclipse.xsd.edit-feature
95
feature@org.eclipse.xsd.edit=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.mdt/org.eclipse.xsd/features/org.eclipse.xsd.edit-feature
107
feature@org.eclipse.xsd.editor=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.mdt/org.eclipse.xsd/features/org.eclipse.xsd.editor-feature
96
feature@org.eclipse.xsd.editor=build_200811251800,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.mdt/org.eclipse.xsd/features/org.eclipse.xsd.editor-feature
(-)builder/all/customTargets.xml (-7 / +1 lines)
Lines 18-24 Link Here
18
	<!-- ===================================================================== -->
18
	<!-- ===================================================================== -->
19
19
20
	<target name="assemble.org.eclipse.emf.all">
20
	<target name="assemble.org.eclipse.emf.all">
21
		<property name="archiveName" value="emf-sdo-xsd-Master-${buildAlias}.zip" />
21
		<property name="archiveName" value="emf-xsd-Master-${buildAlias}.zip" />
22
		<ant antfile="${assembleScriptName}" />
22
		<ant antfile="${assembleScriptName}" />
23
		<!-- ADD POST STEPS -->
23
		<!-- ADD POST STEPS -->
24
	</target>
24
	</target>
Lines 182-188 Link Here
182
		<emf.build.ReplaceText verbose="true" beginToken="&lt;!-- TemplateEntriesBegin --&gt;" endToken="&lt;!-- TemplateEntriesEnd --&gt;" replaceText="">
182
		<emf.build.ReplaceText verbose="true" beginToken="&lt;!-- TemplateEntriesBegin --&gt;" endToken="&lt;!-- TemplateEntriesEnd --&gt;" replaceText="">
183
			<fileset dir="${featuresDir}">
183
			<fileset dir="${featuresDir}">
184
				<include name="org.eclipse.emf.sdk*/feature.xml" />
184
				<include name="org.eclipse.emf.sdk*/feature.xml" />
185
				<include name="org.eclipse.emf.ecore.sdo.sdk*/feature.xml" />
186
				<include name="org.eclipse.xsd.sdk*/feature.xml" />
185
				<include name="org.eclipse.xsd.sdk*/feature.xml" />
187
			</fileset>
186
			</fileset>
188
		</emf.build.ReplaceText>
187
		</emf.build.ReplaceText>
Lines 217-227 Link Here
217
			</fileset>
216
			</fileset>
218
		</unzip>
217
		</unzip>
219
		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
218
		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
220
			<fileset dir="${buildDirectory}/features/org.eclipse.emf.ecore.sdo.sdk">
221
				<include name="*.log.zip" />
222
			</fileset>
223
		</unzip>
224
		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
225
			<fileset dir="${buildDirectory}/features/org.eclipse.xsd.sdk">
219
			<fileset dir="${buildDirectory}/features/org.eclipse.xsd.sdk">
226
				<include name="*.log.zip" />
220
				<include name="*.log.zip" />
227
			</fileset>
221
			</fileset>
(-)builder/tests/configs/local/testing.properties (-2 / +2 lines)
Lines 5-17 Link Here
5
testDir=${testBase}/${buildLabel}
5
testDir=${testBase}/${buildLabel}
6
6
7
#name of zip file containing automated testing framework and JUnit test plug-ins
7
#name of zip file containing automated testing framework and JUnit test plug-ins
8
testFramework=emf-sdo-xsd-Automated-Tests-${buildAlias}.zip
8
testFramework=emf-xsd-Automated-Tests-${buildAlias}.zip
9
9
10
#directory where test scripts are launched
10
#directory where test scripts are launched
11
executionDir=${testDir}/testing
11
executionDir=${testDir}/testing
12
12
13
#name of runtime to install and test
13
#name of runtime to install and test
14
runtime=emf-sdo-xsd-SDK-${buildAlias}.zip
14
runtime=emf-xsd-SDK-${buildAlias}.zip
15
15
16
# instead of downloading and unpacking the JDK each time, just reuse the symlinked one in /opt/
16
# instead of downloading and unpacking the JDK each time, just reuse the symlinked one in /opt/
17
vmExecutable=/opt/ibm-java2-5.0/jre/bin/java
17
vmExecutable=/opt/ibm-java2-5.0/jre/bin/java
(-)builder/tests/configs/local/customTest.xml (-2 / +1 lines)
Lines 4-12 Link Here
4
4
5
		<property name="shell" value="relengbuildgtk.sh"/>
5
		<property name="shell" value="relengbuildgtk.sh"/>
6
		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/emf-runtime-${buildAlias}.zip" />
6
		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/emf-runtime-${buildAlias}.zip" />
7
		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/sdo-runtime-${buildAlias}.zip" />
8
		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/xsd-runtime-${buildAlias}.zip" />
7
		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/xsd-runtime-${buildAlias}.zip" />
9
		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/emf-sdo-xsd-Examples-${buildAlias}.zip" />
8
		<copy todir="${executionDir}" file="${dropLocation}/${buildLabel}/emf-xsd-Examples-${buildAlias}.zip" />
10
	
9
	
11
		<!--copy the script which invokes the tests -->
10
		<!--copy the script which invokes the tests -->
12
		<copy file="${tester}/${shell}" todir="${executionDir}"/>
11
		<copy file="${tester}/${shell}" todir="${executionDir}"/>
(-)packager/packaging.map (-1 / +1 lines)
Lines 1-2 Link Here
1
@eclipseFile@=file:@downloadsDir@/ | | | sdk | eclipse
1
@eclipseFile@=file:@downloadsDir@/ | | | sdk | eclipse
2
emf-sdo-xsd-Master-@buildId@.zip=file:@buildDirectoryLabel@/ | | | sdk | emf
2
emf-xsd-Master-@buildId@.zip=file:@buildDirectoryLabel@/ | | | sdk | emf
(-)buildAll.xml (-27 / +4 lines)
Lines 71-77 Link Here
71
		</condition>
71
		</condition>
72
72
73
		<!-- required for signing & repackaging master zip into smaller zips -->
73
		<!-- required for signing & repackaging master zip into smaller zips -->
74
		<property name="masterZip" value="emf-sdo-xsd-Master-${buildAlias}.zip" />
74
		<property name="masterZip" value="emf-xsd-Master-${buildAlias}.zip" />
75
		<property name="java15-home" value="/opt/sun-java2-5.0" />
75
		<property name="java15-home" value="/opt/sun-java2-5.0" />
76
		<property name="stagingHome" value="/home/data/httpd/download-staging.priv" />
76
		<property name="stagingHome" value="/home/data/httpd/download-staging.priv" />
77
		<property name="projectPath" value="modeling/emf" />
77
		<property name="projectPath" value="modeling/emf" />
Lines 123-129 Link Here
123
		<ant target="packMasterZip" antfile="${helper}" />
123
		<ant target="packMasterZip" antfile="${helper}" />
124
124
125
		<!-- create All In One EMF/SDO/XSD SDK (remove examples & all feature) -->
125
		<!-- create All In One EMF/SDO/XSD SDK (remove examples & all feature) -->
126
		<zip destfile="${buildDirectory}/${buildLabel}/emf-sdo-xsd-SDK-${buildAlias}.zip" update="true" duplicate="preserve">
126
		<zip destfile="${buildDirectory}/${buildLabel}/emf-xsd-SDK-${buildAlias}.zip" update="true" duplicate="preserve">
127
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
127
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
128
				<exclude name="**/org.eclipse.emf.all*" />
128
				<exclude name="**/org.eclipse.emf.all*" />
129
				<exclude name="**/org.eclipse.emf.all*/**" />
129
				<exclude name="**/org.eclipse.emf.all*/**" />
Lines 161-168 Link Here
161
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
161
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
162
				<exclude name="**/org.eclipse.xsd*" />
162
				<exclude name="**/org.eclipse.xsd*" />
163
				<exclude name="**/org.eclipse.xsd*/**" />
163
				<exclude name="**/org.eclipse.xsd*/**" />
164
				<exclude name="**/org.eclipse.emf.*.sdo*" />
165
				<exclude name="**/org.eclipse.emf.*.sdo*/**" />
166
				<exclude name="**/org.eclipse.emf.all*" />
164
				<exclude name="**/org.eclipse.emf.all*" />
167
				<exclude name="**/org.eclipse.emf.all*/**" />
165
				<exclude name="**/org.eclipse.emf.all*/**" />
168
				<exclude name="**/org.eclipse.emf.mapping.xsd*" />
166
				<exclude name="**/org.eclipse.emf.mapping.xsd*" />
Lines 187-213 Link Here
187
			<zipfileset refid="rootfiles" />
185
			<zipfileset refid="rootfiles" />
188
		</zip>
186
		</zip>
189
187
190
		<!-- create SDO sourcedoc (new) -->
191
		<zip destfile="${buildDirectory}/${buildLabel}/sdo-sourcedoc-${buildAlias}.zip" update="true" duplicate="preserve">
192
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
193
				<include name="**/*.emf.ecore.sdo.doc_*" />
194
				<include name="**/*.emf.ecore.sdo.doc_*/**" />
195
				<include name="**/*.emf.ecore.sdo.source_*" />
196
				<include name="**/*.emf.ecore.sdo.source_*/**" />
197
			</zipfileset>
198
			<zipfileset refid="rootfiles" />
199
		</zip>
200
201
		<!-- create SDO runtime (new) -->
202
		<property name="RTExcludes" value="**/org.eclipse.*.example*, **/org.eclipse.*.example*/**, **/org.eclipse.*.sdk*, **/org.eclipse.*.sdk*/**, **/org.eclipse.*.all*, **/org.eclipse.*.all*/**, **/org.eclipse.*.doc*, **/org.eclipse.*.doc*/**, **/org.eclipse.*.source*, **/org.eclipse.*.source*/**, **/*src.zip"/>
203
		<zip destfile="${buildDirectory}/${buildLabel}/sdo-runtime-${buildAlias}.zip" update="true" duplicate="preserve">
204
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" excludes="${RTExcludes}">
205
				<include name="**/org.eclipse.emf.*.sdo*" />
206
				<include name="**/org.eclipse.emf.*.sdo*/**" />
207
			</zipfileset>
208
			<zipfileset refid="rootfiles" />
209
		</zip>
210
211
		<!-- create XSD sourcedoc (new) -->
188
		<!-- create XSD sourcedoc (new) -->
212
		<zip destfile="${buildDirectory}/${buildLabel}/xsd-sourcedoc-${buildAlias}.zip" update="true" duplicate="preserve">
189
		<zip destfile="${buildDirectory}/${buildLabel}/xsd-sourcedoc-${buildAlias}.zip" update="true" duplicate="preserve">
213
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
190
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
Lines 233-239 Link Here
233
		</zip>
210
		</zip>
234
211
235
		<!-- create Examples -->
212
		<!-- create Examples -->
236
		<zip destfile="${buildDirectory}/${buildLabel}/emf-sdo-xsd-Examples-${buildAlias}.zip" update="true" duplicate="preserve">
213
		<zip destfile="${buildDirectory}/${buildLabel}/emf-xsd-Examples-${buildAlias}.zip" update="true" duplicate="preserve">
237
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
214
			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
238
				<exclude name="**/plugins/org.eclipse.xsd.example*_*.jar" />
215
				<exclude name="**/plugins/org.eclipse.xsd.example*_*.jar" />
239
				<exclude name="**/org.eclipse.*.example.installer*" />
216
				<exclude name="**/org.eclipse.*.example.installer*" />
Lines 250-256 Link Here
250
			<zipfileset refid="rootfiles" />
227
			<zipfileset refid="rootfiles" />
251
		</zip>
228
		</zip>
252
229
253
		<!-- purge unneeded emf-sdo-xsd-ALL zip -->
230
		<!-- purge unneeded emf-xsd-ALL zip -->
254
		<delete file="${buildDirectory}/${buildLabel}/${allZip}" />
231
		<delete file="${buildDirectory}/${buildLabel}/${allZip}" />
255
232
256
		<echo-timestamp />
233
		<echo-timestamp />
(-)testManifest.xml (-47 / +4 lines)
Lines 15-34 Link Here
15
				fileName='&lt;a href="emf-sourcedoc-@build@.zip"&gt;emf-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="emf-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
15
				fileName='&lt;a href="emf-sourcedoc-@build@.zip"&gt;emf-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="emf-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
16
			</platform>
16
			</platform>
17
		</zipType>
17
		</zipType>
18
		<zipType name="sdoruntime">
19
			<platform 
20
				id="SDORUN" 
21
				name="All" 
22
				fileName='&lt;a href="sdo-runtime-@build@.zip"&gt;sdo-runtime-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@sdo-runtime-@build@.zip.size@ - checksum:&lt;a href="sdo-runtime-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
23
			</platform>
24
		</zipType>
25
		<zipType name="sdosrc">
26
			<platform 
27
				id="SDOSRC" 
28
				name="All" 
29
				fileName='&lt;a href="sdo-sourcedoc-@build@.zip"&gt;sdo-sourcedoc-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@sdo-sourcedoc-@build@.zip.size@ - checksum:&lt;a href="sdo-sourcedoc-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
30
			</platform>
31
		</zipType>
32
		<zipType name="xsdruntime">
18
		<zipType name="xsdruntime">
33
			<platform 
19
			<platform 
34
				id="XSDRUN" 
20
				id="XSDRUN" 
Lines 47-74 Link Here
47
			<platform 
33
			<platform 
48
				id="SDK" 
34
				id="SDK" 
49
				name="All" 
35
				name="All" 
50
				fileName='&lt;a href="emf-sdo-xsd-SDK-@build@.zip"&gt;emf-sdo-xsd-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-SDK-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
36
				fileName='&lt;a href="emf-xsd-SDK-@build@.zip"&gt;emf-xsd-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-SDK-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
51
			</platform>
37
			</platform>
52
		</zipType>
38
		</zipType>
53
		<zipType name="alltests">
39
		<zipType name="alltests">
54
			<platform 
40
			<platform 
55
				id="T" 
41
				id="T" 
56
				name="All" 
42
				name="All" 
57
				fileName='&lt;a href="emf-sdo-xsd-Automated-Tests-@build@.zip"&gt;emf-sdo-xsd-Automated-Tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Automated-Tests-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
43
				fileName='&lt;a href="emf-xsd-Automated-Tests-@build@.zip"&gt;emf-xsd-Automated-Tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Automated-Tests-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
58
			</platform>
44
			</platform>
59
		</zipType>
45
		</zipType>
60
		<zipType name="allexamples">
46
		<zipType name="allexamples">
61
			<platform 
47
			<platform 
62
				id="EX" 
48
				id="EX" 
63
				name="All" 
49
				name="All" 
64
				fileName='&lt;a href="emf-sdo-xsd-Examples-@build@.zip"&gt;emf-sdo-xsd-Examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Examples-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
50
				fileName='&lt;a href="emf-xsd-Examples-@build@.zip"&gt;emf-xsd-Examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Examples-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
65
			</platform>
51
			</platform>
66
		</zipType>
52
		</zipType>
67
		<zipType name="allModels">
53
		<zipType name="allModels">
68
			<platform 
54
			<platform 
69
				id="AM" 
55
				id="AM" 
70
				name="All" 
56
				name="All" 
71
				fileName='&lt;a href="emf-sdo-xsd-Models-@build@.zip"&gt;emf-sdo-xsd-Models-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-sdo-xsd-Models-@build@.zip.size@ - checksum:&lt;a href="emf-sdo-xsd-Models-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
57
				fileName='&lt;a href="emf-xsd-Models-@build@.zip"&gt;emf-xsd-Models-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@emf-xsd-Models-@build@.zip.size@ - checksum:&lt;a href="emf-xsd-Models-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
72
			</platform>
58
			</platform>
73
		</zipType>
59
		</zipType>
74
	</zipTypes>
60
	</zipTypes>
Lines 108-119 Link Here
108
			<effectedFile id="XSDRUN"></effectedFile>
94
			<effectedFile id="XSDRUN"></effectedFile>
109
		</logFile>
95
		</logFile>
110
96
111
		<logFile name="org.eclipse.emf.test.sdo_linux.gtk.xml">
112
			<effectedFile id="SDK"></effectedFile>
113
			<effectedFile id="EMFSRC"></effectedFile>
114
			<effectedFile id="EMFRUN"></effectedFile>
115
		</logFile>
116
117
		<logFile name="org.eclipse.emf.test.examples_linux.gtk.xml">
97
		<logFile name="org.eclipse.emf.test.examples_linux.gtk.xml">
118
			<effectedFile id="SDK"></effectedFile>
98
			<effectedFile id="SDK"></effectedFile>
119
			<effectedFile id="EMFSRC"></effectedFile>
99
			<effectedFile id="EMFSRC"></effectedFile>
Lines 358-366 Link Here
358
   <logFile name="plugins/org.eclipse.emf.tests_*/*.bin.log">
338
   <logFile name="plugins/org.eclipse.emf.tests_*/*.bin.log">
359
      <effectedFile id="T"></effectedFile>
339
      <effectedFile id="T"></effectedFile>
360
   </logFile>
340
   </logFile>
361
   <logFile name="plugins/org.eclipse.emf.test.sdo_*/*.bin.log">
362
      <effectedFile id="T"></effectedFile>
363
   </logFile>
364
   <logFile name="plugins/org.eclipse.emf.test.tools_*/*.bin.log">
341
   <logFile name="plugins/org.eclipse.emf.test.tools_*/*.bin.log">
365
      <effectedFile id="T"></effectedFile>
342
      <effectedFile id="T"></effectedFile>
366
   </logFile>
343
   </logFile>
Lines 370-395 Link Here
370
   <logFile name="plugins/org.eclipse.emf.examples.jet.article2_*/*.bin.log">
347
   <logFile name="plugins/org.eclipse.emf.examples.jet.article2_*/*.bin.log">
371
      <effectedFile id="EX"></effectedFile>
348
      <effectedFile id="EX"></effectedFile>
372
   </logFile>
349
   </logFile>
373
   <logFile name="plugins/org.eclipse.emf.commonj.sdo_*/*.bin.log">
374
      <effectedFile id="SDK"></effectedFile>
375
      <effectedFile id="EMFRUN"></effectedFile>
376
      <effectedFile id="EMFSDK"></effectedFile>
377
   </logFile>
378
   <logFile name="plugins/org.eclipse.emf.ecore.sdo_*/*.bin.log">
379
      <effectedFile id="SDK"></effectedFile>
380
      <effectedFile id="EMFRUN"></effectedFile>
381
      <effectedFile id="EMFSDK"></effectedFile>
382
   </logFile>
383
   <logFile name="plugins/org.eclipse.emf.ecore.sdo.edit_*/*.bin.log">
384
      <effectedFile id="SDK"></effectedFile>
385
      <effectedFile id="EMFRUN"></effectedFile>
386
      <effectedFile id="EMFSDK"></effectedFile>
387
   </logFile>
388
   <logFile name="plugins/org.eclipse.emf.ecore.sdo.editor_*/*.bin.log">
389
      <effectedFile id="SDK"></effectedFile>
390
      <effectedFile id="EMFRUN"></effectedFile>
391
      <effectedFile id="EMFSDK"></effectedFile>
392
   </logFile>
393
   <logFile name="plugins/org.eclipse.emf.mapping.xsd2ecore_*/*.bin.log">
350
   <logFile name="plugins/org.eclipse.emf.mapping.xsd2ecore_*/*.bin.log">
394
      <effectedFile id="SDK"></effectedFile>
351
      <effectedFile id="SDK"></effectedFile>
395
      <effectedFile id="XSDRUN"></effectedFile>
352
      <effectedFile id="XSDRUN"></effectedFile>
(-)packager/sdk/customTargets.xml (-1 / +1 lines)
Lines 12-18 Link Here
12
	</target>
12
	</target>
13
	
13
	
14
	<!-- TODO: set the root of the output file name -->
14
	<!-- TODO: set the root of the output file name -->
15
	<property name="archiveName" value="emf-sdo-xsd-SDK-${buildId}.zip" />
15
	<property name="archiveName" value="emf-xsd-SDK-${buildId}.zip" />
16
16
17
	<!-- This goal of this target is to get the packaging map files of the things you care for 
17
	<!-- This goal of this target is to get the packaging map files of the things you care for 
18
	       The files must be fetched into the downloadDirectory folder -->
18
	       The files must be fetched into the downloadDirectory folder -->
(-)packager/sdk/packager.properties (-1 / +1 lines)
Lines 6-12 Link Here
6
filteredDependencyCheck=false
6
filteredDependencyCheck=false
7
7
8
# A comma separated list of feature ids that will be part of the archive.
8
# A comma separated list of feature ids that will be part of the archive.
9
featureList=org.eclipse.emf.sdk,org.eclipse.emf.ecore.sdo.sdk,org.eclipse.xsd.sdk
9
featureList=org.eclipse.emf.sdk,org.eclipse.xsd.sdk
10
10
11
# The list of {os, ws, arch} configurations to build.  This 
11
# The list of {os, ws, arch} configurations to build.  This 
12
# value is a '&' separated list of ',' separate triples. 
12
# value is a '&' separated list of ',' separate triples. 

Return to bug 251402