[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] Patch: FYI: change eclipse build infrastructure
From: |
Tom Tromey |
Subject: |
[cp-patches] Patch: FYI: change eclipse build infrastructure |
Date: |
29 Aug 2005 15:46:07 -0600 |
I'm checking this in.
This changes the Eclipse-based Classpath build infrastructure a
little. In particular, output is not directed to a directory named
'install'.
With this approach we can also configure jamvm to directly use the
classpath tree inside the eclipse workspace. This only requires a
'make install' for jamvm and for the classpath JNI code -- eclipse's
internal compiler is also told how to put the class files directly
into the correct output directory.
To see this in action, configure jamvm with --disable-zip (in addition
to the ordinary settings so that it looks inside your workspace).
I think the next step is to make a mauve or wonka launch configuration
so that it is very easy to test classpath changes.
Tom
2005-08-29 Tom Tromey <address@hidden>
* .externalToolBuilders/Configure.launch: Changed --prefix.
* .externalToolBuilders/CompileNative.launch: Invoke install target.
* .cdtproject: New file.
* .classpath: Changed output directory.
* .cvsignore: Added 'install'.
Index: .classpath
===================================================================
RCS file: /cvsroot/classpath/classpath/.classpath,v
retrieving revision 1.7
diff -u -r1.7 .classpath
--- .classpath 17 Aug 2005 21:54:21 -0000 1.7
+++ .classpath 29 Aug 2005 21:42:24 -0000
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry
excluding="compat/|examples/|external/|gnu/classpath/jdwp/|gnu/javax/swing/plaf/|test/|testsuite/|vm/reference/"
kind="src" path=""/>
+ <classpathentry
excluding="compat/|examples/|external/|gnu/classpath/jdwp/|gnu/javax/swing/plaf/|test/|testsuite/|vm/reference/|resource/"
kind="src" path=""/>
+ <classpathentry kind="src" path="resource"/>
<classpathentry excluding="gnu/classpath/jdwp/" kind="src"
path="vm/reference"/>
<classpathentry kind="src" path="external/sax"/>
<classpathentry kind="src" path="external/w3c_dom"/>
<classpathentry kind="src" path="examples"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="install/share/classpath"/>
</classpath>
Index: .cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/.cvsignore,v
retrieving revision 1.11
diff -u -r1.11 .cvsignore
--- .cvsignore 28 Jul 2004 13:41:26 -0000 1.11
+++ .cvsignore 29 Aug 2005 21:42:24 -0000
@@ -15,3 +15,4 @@
stamp-h
stamp-h.in
autom4te*.cache
+install
Index: .externalToolBuilders/CompileNative.launch
===================================================================
RCS file:
/cvsroot/classpath/classpath/.externalToolBuilders/CompileNative.launch,v
retrieving revision 1.1
diff -u -r1.1 CompileNative.launch
--- .externalToolBuilders/CompileNative.launch 16 Aug 2005 21:47:36 -0000
1.1
+++ .externalToolBuilders/CompileNative.launch 29 Aug 2005 21:42:29 -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:<?xml
version="1.0"
encoding="UTF-8"?> <launchConfigurationWorkingSet
factoryID="org.eclipse.ui.internal.WorkingSetFactory"
name="working set"
editPageId="org.eclipse.ui.resourceWorkingSetPage"> <item
factoryID="org.eclipse.ui.internal.model.ResourceFactory"
path="/classpath/native"
type="2"/> </launchConfigurationWorkingSet>}'/><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:<?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/native"
type="2"/> </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}/native'/><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:<?xml
version="1.0"
encoding="UTF-8"?> <launchConfigurationWorkingSet
factoryID="org.eclipse.ui.internal.WorkingSetFactory"
name="working set"
editPageId="org.eclipse.ui.resourceWorkingSetPage"> <item
factoryID="org.eclipse.ui.internal.model.ResourceFactory"
path="/classpath/native"
type="2"/> </launchConfigurationWorkingSet>}'/><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:<?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/native"
type="2"/> </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}/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: /cvsroot/classpath/classpath/.externalToolBuilders/Configure.launch,v
retrieving revision 1.1
diff -u -r1.1 Configure.launch
--- .externalToolBuilders/Configure.launch 1 May 2005 22:05:53 -0000
1.1
+++ .externalToolBuilders/Configure.launch 29 Aug 2005 21:42:29 -0000
@@ -1,10 +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_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="${build_project}/configure"/>
-<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,'/><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
Index: .cdtproject
===================================================================
RCS file: .cdtproject
diff -N .cdtproject
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ .cdtproject 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,3 @@
+<?xml version='1.0'?>
+<?eclipse-cdt version="2.0"?>
+<cdtproject/>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] Patch: FYI: change eclipse build infrastructure,
Tom Tromey <=