Author: lgawron
Date: Wed Dec 1 03:06:07 2004
New Revision: 109324
URL: http://svn.apache.org/viewcvs?view=rev&rev=109324
Log:
fix: eclipse-customized-project used a hard-coded path separator.
Modified:
cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl
cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml
cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
Modified: cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl?view=diff&rev=109324&p1=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl&r1=109323&p2=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl&r2=109324
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl Wed Dec 1 03:06:07
2004
@@ -87,9 +87,9 @@
filtering="yes"
overwrite="yes">
<filterset>
- <filter token="SRC_DIRS" value="${{srcs}}:@eclipse-src@"/>
- <filter token="LIBS" value="${{libs}}:@eclipse-libs@"/>
- <filter token="MOCKS_DIRS" value="${{mockss}}:@eclipse-mocks@"/>
+ <filter token="SRC_DIRS" value="${{srcs}}${{path.separator}}@eclipse-src@"/>
+ <filter token="LIBS" value="${{libs}}${{path.separator}}@eclipse-libs@"/>
+ <filter token="MOCKS_DIRS" value="${{mockss}}${{path.separator}}@eclipse-mocks@"/>
<filter token="OUTPUT_DIR" value="${{ide.eclipse.outputdir}}"/>
</filterset>
</copy>
@@ -106,15 +106,14 @@
<!-- clean up src, libs and mocks -->
<replace file="${{build.temp}}/classpath-temp.xml"
- token=":@eclipse-src@" value=""/>
+ token="${{path.separator}}@eclipse-src@" value=""/>
<replace file="${{build.temp}}/classpath-temp.xml"
- token=":@eclipse-libs@" value=""/>
+ token="${{path.separator}}@eclipse-libs@" value=""/>
<replace file="${{build.temp}}/classpath-temp.xml"
token="@eclipse-libs@" value=""/>
-
<replace file="${{build.temp}}/classpath-temp.xml"
- token=":@eclipse-mocks@" value=""/>
+ token="${{path.separator}}@eclipse-mocks@" value=""/>
<!-- split the path in 'item' XML elements -->
<replace file="${{build.temp}}/classpath-temp.xml"
@@ -132,7 +131,7 @@
<!-- now build the .classpath file -->
<echo>Generate classpath</echo>
- <xslt in="${{build.temp}}/classpath-temp.xml" out="${{basedir}}/.classpath"
+ <xslt in="${{build.temp}}/classpath-temp.xml" out="${{basedir}}/.classpath"
style="${{tools}}/ide/eclipse/make-classpath.xsl">
<param name="exportlib" expression="${{ide.eclipse.export.libs}}"/>
</xslt>
@@ -168,7 +167,7 @@
</path>
<property name="src-{$block-name}" refid="src-{$block-name}"/>
<replace file="${{build.temp}}/classpath-temp.xml"
- token="@eclipse-src@" value="${{src-{$block-name}}}:@eclipse-src@"/>
+ token="@eclipse-src@" value="${{src-{$block-name}}}${{path.separator}}@eclipse-src@"/>
</then>
</if>
<!-- block mocks directory -->
@@ -182,7 +181,7 @@
</path>
<property name="mocks-{$block-name}" refid="mocks-{$block-name}"/>
<replace file="${{build.temp}}/classpath-temp.xml"
- token="@eclipse-mocks@" value="${{mocks-{$block-name}}}:@eclipse-mocks@"/>
+ token="@eclipse-mocks@" value="${{mocks-{$block-name}}}${{path.separator}}@eclipse-mocks@"/>
</then>
</if>
@@ -197,7 +196,7 @@
</path>
<property name="lib-{$block-name}" refid="lib-{$block-name}"/>
<replace file="${{build.temp}}/classpath-temp.xml"
- token="@eclipse-libs@" value="${{lib-{$block-name}}}:@eclipse-libs@"/>
+ token="@eclipse-libs@" value="${{lib-{$block-name}}}${{path.separator}}@eclipse-libs@"/>
</then>
</if>
<!-- Add optional libraries used by this block -->
@@ -222,7 +221,7 @@
</not>
<then>
<replace file="${{build.temp}}/classpath-temp.xml"
- token="@eclipse-libs@" value="${{eclipse-optional-lib-{$block-name}-{@name}}}:@eclipse-libs@"/>
+ token="@eclipse-libs@" value="${{eclipse-optional-lib-{$block-name}-{@name}}}${{path.separator}}@eclipse-libs@"/>
</then>
</if>
</then>
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml?view=diff&rev=109324&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml&r1=109323&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml&r2=109324
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml Wed Dec 1 03:06:07 2004
@@ -153,7 +153,7 @@
<target name="eclipse-webapp-prepare" depends="eclipse-webapp-delete-jars, eclipse-webapp-restore-roles"
description="Prepares the webapp directory to make it usable within Eclipse"/>
- <target name="eclipse-webapp-restore-roles" depends="prepare">
+ <target name="eclipse-webapp-restore-roles" depends="prepare" description="Restore cocoon.roles
(for use with eclipse)">
<copy file="${build.dest}/org/apache/cocoon/cocoon.roles"
tofile="${build.webapp}/WEB-INF/classes/org/apache/cocoon/cocoon.roles"
overwrite="yes"/>
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml?view=diff&rev=109324&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml&r1=109323&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml&r2=109324
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Wed Dec 1 03:06:07 2004
@@ -29,13 +29,13 @@
<property file="src/java/org/apache/cocoon/cocoon.properties"/>
<!-- Detecting the current jvm -->
- <condition property ="target.vm" value="${ant.java.version}">
- <not>
+ <condition property="target.vm" value="${ant.java.version}">
+ <not>
<or>
- <equals arg1="1.1" arg2="${ant.java.version}"/>
- <equals arg1="1.2" arg2="${ant.java.version}"/>
+ <equals arg1="1.1" arg2="${ant.java.version}"/>
+ <equals arg1="1.2" arg2="${ant.java.version}"/>
</or>
- </not>
+ </not>
</condition>
<fail unless="target.vm">Please use a JVM 1.3 or superior to compile cocoon ${version}</fail>
|