From: <th...@us...> - 2009-12-01 09:51:46
|
Revision: 6953 http://jython.svn.sourceforge.net/jython/?rev=6953&view=rev Author: thobes Date: 2009-12-01 09:51:33 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Updated bootstrap script and eclipse build configurations in my sandbox. Modified Paths: -------------- trunk/sandbox/tobias/.classpath trunk/sandbox/tobias/.externalToolBuilders/Build preparation.launch trunk/sandbox/tobias/bootstrap Modified: trunk/sandbox/tobias/.classpath =================================================================== --- trunk/sandbox/tobias/.classpath 2009-11-30 23:27:03 UTC (rev 6952) +++ trunk/sandbox/tobias/.classpath 2009-12-01 09:51:33 UTC (rev 6953) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="com/ziclix/python/sql/|com/ziclix/python/sql/connect/|com/ziclix/python/sql/handler/|com/ziclix/python/sql/pipe/|com/ziclix/python/sql/pipe/csv/|com/ziclix/python/sql/pipe/db/|com/ziclix/python/sql/procedure/|com/ziclix/python/sql/resource/|com/ziclix/python/sql/util/" kind="src" path="jython/src"/> - <classpathentry kind="src" path="ssa/src"/> <classpathentry excluding="org/python/compiler/advanced/ast/" kind="src" path="compiler/src"/> <classpathentry excluding="org/python/code/CodeTable.java|org/python/code/SpecializedCode.java|org/python/frame/JavaFrameAccessor.java" kind="src" path="util/src"/> <classpathentry kind="src" path="bytecode/src"/> @@ -11,17 +10,20 @@ <classpathentry kind="src" path="jython/build/gensrc"/> <classpathentry kind="src" path="jython/tests/java"/> <classpathentry kind="src" path="compiler/test"/> - <classpathentry kind="src" path="ssa/test"/> + <classpathentry kind="src" path="ssa/src/main/java"/> + <classpathentry kind="src" path="ssa/src/test/java"/> <classpathentry kind="lib" path="jython/Demo/jreload/example.jar"/> <classpathentry kind="lib" path="jython/extlibs/antlr-2.7.7.jar"/> <classpathentry kind="lib" path="jython/extlibs/asm-3.1.jar"/> <classpathentry kind="lib" path="jython/extlibs/asm-commons-3.1.jar"/> <classpathentry kind="lib" path="jython/extlibs/asm-util-3.1.jar"/> - <classpathentry kind="lib" path="jython/extlibs/constantine-0.4.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="jython/extlibs/constantine.jar"/> + <classpathentry kind="lib" path="jython/extlibs/jffi-Darwin.jar"/> + <classpathentry kind="lib" path="jython/extlibs/jffi.jar"/> + <classpathentry kind="lib" path="jython/extlibs/jnr-posix.jar"/> <classpathentry kind="lib" path="jython/extlibs/cpptasks/cpptasks.jar"/> <classpathentry kind="lib" path="jython/extlibs/jarjar-0.7.jar"/> - <classpathentry kind="lib" path="jython/extlibs/jna-posix.jar"/> - <classpathentry kind="lib" path="jython/extlibs/jna.jar"/> <classpathentry kind="lib" path="jython/extlibs/junit-3.8.2.jar"/> <classpathentry kind="lib" path="jython/extlibs/libreadline-java-0.8.jar"/> <classpathentry kind="lib" path="jython/extlibs/mysql-connector-java-5.1.6.jar"/> @@ -38,7 +40,6 @@ <classpathentry kind="lib" path="jython/Lib/test/classimport_Lib.jar"/> <classpathentry kind="lib" path="jython/Lib/test/classimport.jar"/> <classpathentry kind="lib" path="jython/Lib/test/syspath_import.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0 (Mac OS X default)"/> <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/> <classpathentry kind="lib" path="jython/extlibs/antlr-3.1.3.jar"/> <classpathentry kind="lib" path="jython/extlibs/antlr-runtime-3.1.3.jar"/> Modified: trunk/sandbox/tobias/.externalToolBuilders/Build preparation.launch =================================================================== --- trunk/sandbox/tobias/.externalToolBuilders/Build preparation.launch 2009-11-30 23:27:03 UTC (rev 6952) +++ trunk/sandbox/tobias/.externalToolBuilders/Build preparation.launch 2009-12-01 09:51:33 UTC (rev 6953) @@ -1,28 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="brand-version,antlr_gen,"/> <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="brand-version,antlr_gen,"/> <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/advanced-compiler/jython/build.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/> <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="advanced-compiler"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> <mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES"> -<mapEntry key="eclipse.pdebuild.scripts" value="/Library/eclipse/plugins/org.eclipse.pde.build_3.4.1.R34x_v20080805/scripts/"/> <mapEntry key="eclipse.running" value="true"/> -<mapEntry key="eclipse.pdebuild.home" value="/Library/eclipse/plugins/org.eclipse.pde.build_3.4.1.R34x_v20080805/./"/> -<mapEntry key="eclipse.home" value="/Library/eclipse"/> <mapEntry key="compile.dir" value="${project_loc:/target/build}"/> +<mapEntry key="eclipse.home" value="/Library/eclipse"/> <mapEntry key="eclipse.pdebuild.templates" value="/Library/eclipse/plugins/org.eclipse.pde.build_3.4.1.R34x_v20080805/templates/"/> +<mapEntry key="eclipse.pdebuild.home" value="/Library/eclipse/plugins/org.eclipse.pde.build_3.4.1.R34x_v20080805/./"/> +<mapEntry key="eclipse.pdebuild.scripts" value="/Library/eclipse/plugins/org.eclipse.pde.build_3.4.1.R34x_v20080805/scripts/"/> </mapAttribute> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/advanced-compiler/jython/build.xml}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jython-extended/jython/build.xml}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> Modified: trunk/sandbox/tobias/bootstrap =================================================================== --- trunk/sandbox/tobias/bootstrap 2009-11-30 23:27:03 UTC (rev 6952) +++ trunk/sandbox/tobias/bootstrap 2009-12-01 09:51:33 UTC (rev 6953) @@ -71,7 +71,7 @@ build elif [ 0 -eq 0 ]; then # disable the next branch - it is too slow... - echo -n + false elif [ -n "`which svn`" ]; then # TODO: speed up this comparison - then it can be enabled... BASE_REVISION=`svn info | grep ^Revision` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |