wip

fabioz · Oct 29, 2023 · 708533d · 708533d
1 parent 56d1d77
commit 708533d
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 549 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,3 +54,4 @@ plugins/org.python.pydev.core/pysrc/.settings
 **/v2_indexcache/**
 plugins/com.python.pydev.runalltests/fake_homedir*
 .cache
+/__pycache__/
diff --git a/.travis.yml b/.travis.yml
diff --git a/builders/org.python.pydev.build/add_tests_to_plugins.py b/builders/org.python.pydev.build/add_tests_to_plugins.py
@@ -69,10 +69,10 @@ def main():
                     manifest = plugin_dir / 'META-INF' / 'MANIFEST.MF'
                     txt = manifest.read_text('utf-8')
                     assert txt.count('Bundle-ClassPath: refactoring.jar') == 1
-                    assert 'tests/lib/xstream-1.4.4.jar' not in txt
+                    assert 'tests/lib/xstream-1.4.20.jar' not in txt
                     txt = txt.replace('Bundle-ClassPath: refactoring.jar', '''Bundle-ClassPath: refactoring.jar,
  tests/lib/xpp3-1.1.3.4.O.jar,
- tests/lib/xstream-1.4.4.jar,
+ tests/lib/xstream-1.4.20.jar,
  contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar''')
                     manifest.write_text(txt, 'utf-8')
                     print('Writing', manifest)
@@ -83,7 +83,7 @@ def main():
                     classpath.write_text(txt, 'utf-8')
                     print('Writing', classpath)
 
-                    properties['jars.extra.classpath'] = 'contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar,tests/lib/xpp3-1.1.3.4.O.jar,tests/lib/xstream-1.4.4.jar'
+                    properties['jars.extra.classpath'] = 'contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar,tests/lib/xpp3-1.1.3.4.O.jar,tests/lib/xstream-1.4.20.jar'
 
                 print('Updating', build_properties)
                 with build_properties.open('w') as fp:

diff --git a/make_s3cfg.sh b/make_s3cfg.sh
diff --git a/rootproject/.project b/rootproject/.project
@@ -25,11 +25,6 @@
 			<type>1</type>
 			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/.gitignore</locationURI>
 		</link>
-		<link>
-			<name>.travis.yml</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/.travis.yml</locationURI>
-		</link>
 		<link>
 			<name>LICENSE.txt</name>
 			<type>1</type>
@@ -55,11 +50,6 @@
 			<type>1</type>
 			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/make_release.py</locationURI>
 		</link>
-		<link>
-			<name>make_s3cfg.sh</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/make_s3cfg.sh</locationURI>
-		</link>
 		<link>
 			<name>pom.xml</name>
 			<type>1</type>
@@ -70,31 +60,6 @@
 			<type>2</type>
 			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/report</locationURI>
 		</link>
-		<link>
-			<name>test_with_tycho.patch</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/test_with_tycho.patch</locationURI>
-		</link>
-		<link>
-			<name>travis.TODO</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/travis.TODO</locationURI>
-		</link>
-		<link>
-			<name>travisdeps.sh</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/travisdeps.sh</locationURI>
-		</link>
-		<link>
-			<name>travisgetkeystore.sh</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/travisgetkeystore.sh</locationURI>
-		</link>
-		<link>
-			<name>travisupload.sh</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/travisupload.sh</locationURI>
-		</link>
 		<link>
 			<name>update_version.py</name>
 			<type>1</type>