classpath-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[cp-patches] Patch: FYI: Eclipse builder fixes


From: Thomas Fitzsimmons
Subject: [cp-patches] Patch: FYI: Eclipse builder fixes
Date: Wed, 21 Dec 2005 19:44:20 -0500

Hi,

I committed this patch.  It specifies which resources various builders
should track and sets the builders to automatically rebuild upon
resource modification.  The patch also introduces the
ClasspathHeaders.launch builder for rebuilding JNI headers automatically
with a corresponding patch to include/Makefile.am and sets the
--enable-regen-headers option in the Configure builder.

With this patch Autogen will be run on any modification to a Makefile.am
or configure.ac.  Configure will run on a modification of the top-level
Makefile.in (which implies that Autogen has run).  CompileNative is run
automatically when any file under native/ is modified.  ClasspathHeaders
will when include/Makefile.in is modified, which implies a new header
has been added to Makefile.am and Autogen re-run (this should really be
expanded to all resources that have native methods, but finding/setting
these is cumbersome.  To force a rebuild just change Makefile.in
trivially and save it).

Tom

2005-12-21  Thomas Fitzsimmons  <address@hidden>

        * .project: Add ClasspathHeaders.launch.
        * .externalToolBuilders/Autogen.launch: Run automatically when
        Makefile.am or configure.ac is updated.
        * .externalToolBuilders/CompileNative.launch: Run automatically.
        * .externalToolBuilders/Configure.launch: Run automatically when
        top-level Makefile.in changes.
        * include/Makefile.am (CLASSDIR): New variable.  Replace lib
        references with $(CLASSDIR).
        * .externalToolBuilders/ClasspathHeaders.launch: New builder.

Index: .project
===================================================================
RCS file: /sources/classpath/classpath/.project,v
retrieving revision 1.4
diff -u -r1.4 .project
--- .project    16 Aug 2005 21:47:37 -0000      1.4
+++ .project    22 Dec 2005 00:30:37 -0000
@@ -7,7 +7,7 @@
        <buildSpec>
                <buildCommand>
                        
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-                       <triggers>full,incremental,</triggers>
+                       <triggers>auto,full,incremental,</triggers>
                        <arguments>
                                <dictionary>
                                        <key>LaunchConfigHandle</key>
@@ -17,7 +17,7 @@
                </buildCommand>
                <buildCommand>
                        
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-                       <triggers>full,incremental,</triggers>
+                       <triggers>auto,full,incremental,</triggers>
                        <arguments>
                                <dictionary>
                                        <key>LaunchConfigHandle</key>
@@ -37,7 +37,17 @@
                </buildCommand>
                <buildCommand>
                        
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-                       <triggers>full,incremental,</triggers>
+                       <triggers>auto,full,incremental,</triggers>
+                       <arguments>
+                               <dictionary>
+                                       <key>LaunchConfigHandle</key>
+                                       
<value>&lt;project&gt;/.externalToolBuilders/ClasspathHeaders.launch</value>
+                               </dictionary>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+                       <triggers>auto,full,incremental,</triggers>
                        <arguments>
                                <dictionary>
                                        <key>LaunchConfigHandle</key>
Index: .externalToolBuilders/Autogen.launch
===================================================================
RCS file: /sources/classpath/classpath/.externalToolBuilders/Autogen.launch,v
retrieving revision 1.1
diff -u -r1.1 Autogen.launch
--- .externalToolBuilders/Autogen.launch        1 May 2005 22:05:53 -0000       
1.1
+++ .externalToolBuilders/Autogen.launch        22 Dec 2005 00:30:39 -0000
@@ -1,11 +1,2 @@
-<?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_TOOL_ARGUMENTS" 
value="./autogen.sh"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" 
value="full,incremental,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" 
value="${project}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" 
value="${build_project}"/>
-<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="true"/>
-</launchConfiguration>
+<?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:&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet 
factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; 
name=&quot;workingSet&quot; 
editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/external/sax/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/external/w3c_dom/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/test/java.net/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/test/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/java-nio/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/midi-dssi/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/vmi/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/test/java.util/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/target/generic/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/lib/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/fdlibm/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/target/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/target/Linux/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/Makefile.am&quot; type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/examples/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jawt/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/gtk-peer/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/classpath/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/midi-alsa/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/test/java.lang.reflect/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/test/java.io/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/external/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/xmlj/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/compat/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/qt-peer/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/vm/reference/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/java-util/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/test/gnu.java.lang.reflect/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/configure.ac&quot; type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/compat/java.net/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/include/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/java-lang/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/java-io/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/doc/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/gnu/test/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/doc/api/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/testsuite/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/java-net/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/vm/Makefile.am&quot; type=&quot;1&quot;/&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native/jni/Makefile.am&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}'/><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
Index: .externalToolBuilders/ClasspathHeaders.launch
===================================================================
RCS file: .externalToolBuilders/ClasspathHeaders.launch
diff -N .externalToolBuilders/ClasspathHeaders.launch
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ .externalToolBuilders/ClasspathHeaders.launch       22 Dec 2005 00:30:39 
-0000
@@ -0,0 +1,2 @@
+<?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:&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet 
factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; 
name=&quot;workingSet&quot; 
editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/include/Makefile&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}'/><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
Index: .externalToolBuilders/CompileNative.launch
===================================================================
RCS file: 
/sources/classpath/classpath/.externalToolBuilders/CompileNative.launch,v
retrieving revision 1.2
diff -u -r1.2 CompileNative.launch
--- .externalToolBuilders/CompileNative.launch  29 Aug 2005 21:51:44 -0000      
1.2
+++ .externalToolBuilders/CompileNative.launch  22 Dec 2005 00:30:39 -0000
@@ -1,2 +1,2 @@
 <?xml version='1.0'?>
-<launchConfiguration 
type='org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'><stringAttribute
 key='org.eclipse.debug.core.ATTR_REFRESH_SCOPE' value='${working_set:&lt;?xml 
version=&quot;1.0&quot; 
encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet 
factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; 
name=&quot;working set&quot; 
editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native&quot; 
type=&quot;2&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}'/><stringAttribute
 key='org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS' 
value='full,incremental,'/><stringAttribute 
key='org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE' 
value='${working_set:&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet 
factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; 
name=&quot;workingSet&quot; 
editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native&quot; 
type=&quot;2&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}'/><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}/native 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
+<launchConfiguration 
type='org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'><stringAttribute
 key='org.eclipse.debug.core.ATTR_REFRESH_SCOPE' value='${working_set:&lt;?xml 
version=&quot;1.0&quot; 
encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet 
factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; 
name=&quot;working set&quot; 
editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native&quot; 
type=&quot;2&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}'/><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:&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet 
factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; 
name=&quot;workingSet&quot;&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/native&quot; 
type=&quot;2&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}'/><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}/native 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
Index: .externalToolBuilders/Configure.launch
===================================================================
RCS file: /sources/classpath/classpath/.externalToolBuilders/Configure.launch,v
retrieving revision 1.2
diff -u -r1.2 Configure.launch
--- .externalToolBuilders/Configure.launch      29 Aug 2005 21:51:44 -0000      
1.2
+++ .externalToolBuilders/Configure.launch      22 Dec 2005 00:30:39 -0000
@@ -1,2 +1,2 @@
 <?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,'/><stringAttribute 
key='org.eclipse.ui.externaltools.ATTR_LOCATION' 
value='${build_project}/configure'/><stringAttribute 
key='org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY' 
value='${build_project}'/><booleanAttribute 
key='org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED' 
value='true'/><stringAttribute 
key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' 
value='--prefix=${build_project}/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
+<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:&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet 
factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; 
name=&quot;workingSet&quot; 
editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item 
factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; 
path=&quot;/classpath/Makefile.in&quot; 
type=&quot;1&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}'/><stringAttribute
 key='org.eclipse.ui.externaltools.ATTR_LOCATION' 
value='${build_project}/configure'/><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='--prefix=${build_project}/install --enable-regen-headers 
--enable-gtk-cairo'/><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
Index: include/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/include/Makefile.am,v
retrieving revision 1.49
diff -u -r1.49 Makefile.am
--- include/Makefile.am 3 Oct 2005 01:53:12 -0000       1.49
+++ include/Makefile.am 22 Dec 2005 00:30:44 -0000
@@ -5,6 +5,7 @@
 ARG_JNI_JAVAH = -jni
 ARG_CLASSPATH_JAVAH = -bootclasspath
 JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) 
../lib:$(USER_CLASSLIB)
+CLASSDIR = lib
 
 SOUND_H_FILES = \
 $(top_srcdir)/include/gnu_javax_sound_midi_alsa_AlsaPortDevice.h \
@@ -142,25 +143,25 @@
 
 all-local: $(H_FILES)
 
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_%.h: 
$(top_builddir)/lib/gnu/xml/libxmlj/dom/%.class
+$(top_srcdir)/include/gnu_xml_libxmlj_dom_%.h: 
$(top_builddir)/$(CLASSDIR)/gnu/xml/libxmlj/dom/%.class
        $(JAVAH) -o $@ gnu.xml.libxmlj.dom.$*
 
-$(top_srcdir)/include/gnu_xml_libxmlj_sax_%.h: 
$(top_builddir)/lib/gnu/xml/libxmlj/sax/%.class
+$(top_srcdir)/include/gnu_xml_libxmlj_sax_%.h: 
$(top_builddir)/$(CLASSDIR)/gnu/xml/libxmlj/sax/%.class
        $(JAVAH) -o $@ gnu.xml.libxmlj.sax.$*
 
-$(top_srcdir)/include/gnu_xml_libxmlj_transform_%.h: 
$(top_builddir)/lib/gnu/xml/libxmlj/transform/%.class
+$(top_srcdir)/include/gnu_xml_libxmlj_transform_%.h: 
$(top_builddir)/$(CLASSDIR)/gnu/xml/libxmlj/transform/%.class
        $(JAVAH) -o $@ gnu.xml.libxmlj.transform.$*
 
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_%.h: 
$(top_builddir)/lib/gnu/java/awt/peer/gtk/%.class
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_%.h: 
$(top_builddir)/$(CLASSDIR)/gnu/java/awt/peer/gtk/%.class
        $(JAVAH) -o $@ gnu.java.awt.peer.gtk.$*
 
-$(top_srcdir)/include/gnu_java_awt_peer_qt_%.h: 
$(top_builddir)/lib/gnu/java/awt/peer/qt/%.class
+$(top_srcdir)/include/gnu_java_awt_peer_qt_%.h: 
$(top_builddir)/$(CLASSDIR)/gnu/java/awt/peer/qt/%.class
        $(JAVAH) -o $@ gnu.java.awt.peer.qt.$*
 
-$(top_srcdir)/include/gnu_javax_sound_midi_alsa_%.h: 
$(top_builddir)/lib/gnu/javax/sound/midi/alsa/%.class
+$(top_srcdir)/include/gnu_javax_sound_midi_alsa_%.h: 
$(top_builddir)/$(CLASSDIR)/gnu/javax/sound/midi/alsa/%.class
        $(JAVAH) -o $@ gnu.javax.sound.midi.alsa.$*
 
-$(top_srcdir)/include/gnu_javax_sound_midi_dssi_%.h: 
$(top_builddir)/lib/gnu/javax/sound/midi/dssi/%.class
+$(top_srcdir)/include/gnu_javax_sound_midi_dssi_%.h: 
$(top_builddir)/$(CLASSDIR)/gnu/javax/sound/midi/dssi/%.class
        $(JAVAH) -o $@ gnu.javax.sound.midi.dssi.$*
 
 $(top_srcdir)/include/gnu_java_net_PlainDatagramSocketImpl.h: 
$(top_srcdir)/gnu/java/net/PlainDatagramSocketImpl.java

reply via email to

[Prev in Thread] Current Thread [Next in Thread]