diff options
| author | Casey Marshall <csm@gnu.org> | 2006-06-03 07:51:56 +0000 |
|---|---|---|
| committer | Casey Marshall <csm@gnu.org> | 2006-06-03 07:51:56 +0000 |
| commit | 42e71002871f814c1e13c8e904d899cedccc7628 (patch) | |
| tree | 0ccce8602242db90e805213f750e9e76e206ba37 | |
| parent | b49c11c19e85871516ec44e50b4a799d7255637b (diff) | |
| download | classpath-42e71002871f814c1e13c8e904d899cedccc7628.tar.gz | |
Updating Eclipse configuration to install classpath in `install-root,' not `install.'
Also, omit obsolete Jessie files from the build for now.
| -rw-r--r-- | .classpath | 4 | ||||
| -rw-r--r-- | .externalToolBuilders/Autogen.launch | 18 | ||||
| -rw-r--r-- | .externalToolBuilders/ClasspathHeaders.launch | 13 | ||||
| -rw-r--r-- | .externalToolBuilders/ClasspathJar.launch | 4 | ||||
| -rw-r--r-- | .externalToolBuilders/Configure.launch | 4 |
5 files changed, 33 insertions, 10 deletions
diff --git a/.classpath b/.classpath index 611ba22c6..45ad5d970 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding=".externalToolBuilders/|.settings/|ChangeLog*|Makefile*|autom4te.cache/|compat/|config*|doc/|examples/|external/|external/relaxngDatatype/|include/|install/|lib/|m4/|native/|resource/|scripts/|test/|testsuite/|tools/|vm/reference/" kind="src" path=""/> + <classpathentry excluding=".externalToolBuilders/|.settings/|ChangeLog*|Makefile*|autom4te.cache/|compat/|config*|doc/|examples/|external/|external/relaxngDatatype/|gnu/javax/net/ssl/provider/Context.java|gnu/javax/net/ssl/provider/DiffieHellman.java|gnu/javax/net/ssl/provider/DigestInputStream.java|gnu/javax/net/ssl/provider/DigestOutputStream.java|gnu/javax/net/ssl/provider/Enumerated.java|gnu/javax/net/ssl/provider/Extensions.java|gnu/javax/net/ssl/provider/GNUSecurityParameters.java|gnu/javax/net/ssl/provider/JCESecurityParameters.java|gnu/javax/net/ssl/provider/JDBCSessionContext.java|gnu/javax/net/ssl/provider/Jessie.java|gnu/javax/net/ssl/provider/JessieDHPrivateKey.java|gnu/javax/net/ssl/provider/JessieDHPublicKey.java|gnu/javax/net/ssl/provider/JessieRSAPrivateKey.java|gnu/javax/net/ssl/provider/JessieRSAPublicKey.java|gnu/javax/net/ssl/provider/KeyPool.java|gnu/javax/net/ssl/provider/OverflowException.java|gnu/javax/net/ssl/provider/RecordInput.java|gnu/javax/net/ssl/provider/RecordInputStream.java|gnu/javax/net/ssl/provider/RecordOutputStream.java|gnu/javax/net/ssl/provider/RecordingInputStream.java|gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java|gnu/javax/net/ssl/provider/SSLRSASignature.java|gnu/javax/net/ssl/provider/SSLRandom.java|gnu/javax/net/ssl/provider/SSLServerSocket.java|gnu/javax/net/ssl/provider/SSLServerSocketFactory.java|gnu/javax/net/ssl/provider/SSLSocket.java|gnu/javax/net/ssl/provider/SSLSocketFactory.java|gnu/javax/net/ssl/provider/SSLSocketInputStream.java|gnu/javax/net/ssl/provider/SSLSocketOutputStream.java|gnu/javax/net/ssl/provider/SecurityParameters.java|gnu/javax/net/ssl/provider/Session.java|gnu/javax/net/ssl/provider/SessionContext.java|gnu/javax/net/ssl/provider/SynchronizedRandom.java|gnu/javax/net/ssl/provider/TLSHMac.java|gnu/javax/net/ssl/provider/TLSRandom.java|gnu/javax/net/ssl/provider/X509KeyManagerFactory.java|gnu/javax/net/ssl/provider/X509TrustManagerFactory.java|gnu/javax/net/ssl/provider/XMLSessionContext.java|include/|install-root/|jessie-tests/|lib/|m4/|native/|resource/|scripts/|test/|testsuite/|tools/|vm/reference/" kind="src" path=""/> <classpathentry excluding=".cvsignore|Makefile|Makefile.am|Makefile.in|README.txt" kind="src" path="external/relaxngDatatype"/> <classpathentry excluding=".cvsignore|Makefile|Makefile.am|Makefile.in|README" kind="src" path="tools"/> <classpathentry excluding=".cvsignore|Makefile|Makefile.am|Makefile.in" kind="src" path="resource"/> @@ -8,5 +8,5 @@ <classpathentry excluding=".cvsignore|Makefile|Makefile.am|Makefile.in|README" kind="src" path="external/sax"/> <classpathentry excluding=".cvsignore|Makefile|Makefile.am|Makefile.in|README" kind="src" path="external/w3c_dom"/> <classpathentry excluding=".cvsignore|Makefile|Makefile.am|Makefile.in|Makefile.jawt|Makefile.jawt.in|README" kind="src" path="examples"/> - <classpathentry kind="output" path="install/share/classpath"/> + <classpathentry kind="output" path="install-root/share/classpath"/> </classpath> diff --git a/.externalToolBuilders/Autogen.launch b/.externalToolBuilders/Autogen.launch index a6051b111..04b254476 100644 --- a/.externalToolBuilders/Autogen.launch +++ b/.externalToolBuilders/Autogen.launch @@ -1,2 +1,16 @@ -<?xml version='1.0'?> -<launchConfiguration type='org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'><stringAttribute key='org.eclipse.debug.core.ATTR_REFRESH_SCOPE' value='${project}'/><stringAttribute key='org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS' value='full,incremental,auto,'/><stringAttribute key='org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE' value='${working_set:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet factoryID="org.eclipse.ui.internal.WorkingSetFactory" name="workingSet" editPageId="org.eclipse.ui.resourceWorkingSetPage"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/external/sax/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/external/w3c_dom/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/java.net/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-nio/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/midi-dssi/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/vmi/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/java.util/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/target/generic/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/lib/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/fdlibm/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/target/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/target/Linux/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/examples/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jawt/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/gtk-peer/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/classpath/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/midi-alsa/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/java.lang.reflect/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/java.io/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/external/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/xmlj/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/compat/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/qt-peer/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/vm/reference/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-util/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/gnu.java.lang.reflect/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/configure.ac" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/compat/java.net/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/include/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-lang/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-io/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/doc/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/gnu/test/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/doc/api/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/testsuite/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-net/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/vm/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/Makefile.am" type="1"/> </launchConfigurationWorkingSet>}'/><stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='/bin/sh'/><booleanAttribute key='org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED' value='true'/><stringAttribute key='org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY' value='${build_project}'/><booleanAttribute key='org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED' value='true'/><stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='./autogen.sh'/><booleanAttribute key='org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND' value='false'/><booleanAttribute key='org.eclipse.debug.core.appendEnvironmentVariables' value='true'/></launchConfiguration>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> +<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet editPageId="org.eclipse.ui.resourceWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" label="workingSet" name="workingSet"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/include/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/gtk-peer/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/midi-dssi/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/gnu.java.lang.reflect/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/target/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-util/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/compat/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/examples/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jawt/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/external/w3c_dom/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-io/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/external/sax/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/midi-alsa/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/lib/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/xmlj/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/vmi/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/compat/java.net/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-nio/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/gnu/test/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/doc/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/doc/api/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/target/Linux/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/target/generic/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/java.io/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/classpath/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-lang/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/java.net/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/qt-peer/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/testsuite/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/fdlibm/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/java.lang.reflect/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/vm/reference/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/native/jni/java-net/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/external/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/configure.ac" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/test/java.util/Makefile.am" type="1"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/vm/Makefile.am" type="1"/> </launchConfigurationWorkingSet>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="./autogen.sh"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/> +<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}"/> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="PATH" value="/opt/local/bin:/bin:/sbin:/usr/bin:/usr/local/bin:/usr/sbin:/opt/local/bin:/Users/csm/Library/free-java/bin:/Users/csm/bin"/> +</mapAttribute> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/bin/sh"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/> +</launchConfiguration> diff --git a/.externalToolBuilders/ClasspathHeaders.launch b/.externalToolBuilders/ClasspathHeaders.launch index 0c8481719..de1b00da2 100644 --- a/.externalToolBuilders/ClasspathHeaders.launch +++ b/.externalToolBuilders/ClasspathHeaders.launch @@ -1,2 +1,11 @@ -<?xml version='1.0'?> -<launchConfiguration type='org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'><stringAttribute key='org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS' value='full,incremental,auto,'/><stringAttribute key='org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE' value='${working_set:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet factoryID="org.eclipse.ui.internal.WorkingSetFactory" name="workingSet" editPageId="org.eclipse.ui.resourceWorkingSetPage"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/include/Makefile" type="1"/> </launchConfigurationWorkingSet>}'/><stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='${system_path:make}'/><booleanAttribute key='org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED' value='true'/><stringAttribute key='org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY' value='${build_project}'/><stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-C ${build_project}/include CLASSDIR=install/share/classpath USER_CLASSLIB=../install/share/classpath all install'/><booleanAttribute key='org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND' value='false'/><booleanAttribute key='org.eclipse.debug.core.appendEnvironmentVariables' value='true'/></launchConfiguration>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet editPageId="org.eclipse.ui.resourceWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" label="workingSet" name="workingSet"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/include/Makefile" type="1"/> </launchConfigurationWorkingSet>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-C ${build_project}/include CLASSDIR=install-root/share/classpath USER_CLASSLIB=../install-root/share/classpath all install"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_path:make}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +</launchConfiguration> diff --git a/.externalToolBuilders/ClasspathJar.launch b/.externalToolBuilders/ClasspathJar.launch index e58a58b3a..11aff526a 100644 --- a/.externalToolBuilders/ClasspathJar.launch +++ b/.externalToolBuilders/ClasspathJar.launch @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType"> <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet factoryID="org.eclipse.ui.internal.WorkingSetFactory" name="workingSet"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/install/share/classpath" type="2"/> </launchConfigurationWorkingSet>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet factoryID="org.eclipse.ui.internal.WorkingSetFactory" name="workingSet"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath-ssl-nio/install-root/share/classpath" type="2"/> </launchConfigurationWorkingSet>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-cf glibj.zip META-INF java gnu org javax vm"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project:install/share/classpath}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project:install-root/share/classpath}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_path:jar}"/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> diff --git a/.externalToolBuilders/Configure.launch b/.externalToolBuilders/Configure.launch index d2347ae84..e67bd721d 100644 --- a/.externalToolBuilders/Configure.launch +++ b/.externalToolBuilders/Configure.launch @@ -2,8 +2,8 @@ <launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType"> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet editPageId="org.eclipse.ui.resourceWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" name="workingSet"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/Makefile.in" type="1"/> </launchConfigurationWorkingSet>}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--prefix=${build_project}/install --enable-regen-headers --with-ecj"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet editPageId="org.eclipse.ui.resourceWorkingSetPage" factoryID="org.eclipse.ui.internal.WorkingSetFactory" label="workingSet" name="workingSet"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/classpath/Makefile.in" type="1"/> </launchConfigurationWorkingSet>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--prefix=${build_project}/install-root --enable-regen-headers --with-ecj --disable-gtk-peer --disable-plugin"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/> <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}"/> |