You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2005/10/13 10:39:29 UTC
svn commit: r320695 - in /cocoon/trunk/tools:
ide/eclipse/blocks-classpath.xsl ide/eclipse/classpath-tmpl.xml
ide/eclipse/make-classpath.xsl targets/ide-build.xml
Author: lgawron
Date: Thu Oct 13 01:39:20 2005
New Revision: 320695
URL: http://svn.apache.org/viewcvs?rev=320695&view=rev
Log:
obsolete eclipse-project replaced with customized one
Modified:
cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl
cocoon/trunk/tools/ide/eclipse/classpath-tmpl.xml
cocoon/trunk/tools/ide/eclipse/make-classpath.xsl
cocoon/trunk/tools/targets/ide-build.xml
Modified: cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl?rev=320695&r1=320694&r2=320695&view=diff
==============================================================================
--- cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl (original)
+++ cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl Thu Oct 13 01:39:20 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: cocoon/trunk/tools/ide/eclipse/classpath-tmpl.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/ide/eclipse/classpath-tmpl.xml?rev=320695&r1=320694&r2=320695&view=diff
==============================================================================
--- cocoon/trunk/tools/ide/eclipse/classpath-tmpl.xml (original)
+++ cocoon/trunk/tools/ide/eclipse/classpath-tmpl.xml Thu Oct 13 01:39:20 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: cocoon/trunk/tools/ide/eclipse/make-classpath.xsl
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/ide/eclipse/make-classpath.xsl?rev=320695&r1=320694&r2=320695&view=diff
==============================================================================
--- cocoon/trunk/tools/ide/eclipse/make-classpath.xsl (original)
+++ cocoon/trunk/tools/ide/eclipse/make-classpath.xsl Thu Oct 13 01:39:20 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
(see "eclipse-project" target in build.xml)
@author Sylvain Wallez
- @version CVS $Id$
+ @version $Id$
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
Modified: cocoon/trunk/tools/targets/ide-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/ide-build.xml?rev=320695&r1=320694&r2=320695&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/ide-build.xml (original)
+++ cocoon/trunk/tools/targets/ide-build.xml Thu Oct 13 01:39:20 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
-->
<!-- $Id$ -->
<project name="ide">
+ <description>IDE targets</description>
- <description>
- IDE targets
- </description>
-
+ <!-- for those who like long names.. -->
+ <target name="eclipse-customized-project" depends="eclipse-project"/>
+
<!-- Build the Eclipse customized project's files -->
- <target name="eclipse-customized-project" description="Generate the Eclipse customized project files (using local.block.properties)">
+ <target name="eclipse-project" description="Generate the Eclipse customized project files (using local.block.properties)">
<echo message="Building Eclipse Customized Project Files"/>
<xslt in="${gump.descriptor}"
- out="${build.temp}/blocks-eclipse.xml"
- style="${tools}/ide/eclipse/blocks-classpath.xsl"/>
+ out="${build.temp}/blocks-eclipse.xml"
+ style="${tools}/ide/eclipse/blocks-classpath.xsl"/>
<ant antfile="${build.temp}/blocks-eclipse.xml"
inheritAll="true"
@@ -48,111 +48,6 @@
<filter token="jar.files" value="${jar.files}"/>
<filter token="src" value="${java}"/>
<filter token="build.webapp" value="${build.webapp}"/>
- </filterset>
- </copy>
- </target>
-
- <!-- Build the Eclipse projects files -->
- <target name="eclipse-project" description="Generate the Eclipse project files">
-
- <echo message="Building Eclipse Project Files"/>
-
- <!-- prepare the various paths that will form the project -->
- <path id="srcs">
- <!-- main source dir -->
- <pathelement path="${java}"/>
- <!-- samples source dir -->
- <pathelement path="${src}/samples"/>
- <!-- deprecated source dir -->
- <pathelement path="${src}/deprecated/java"/>
- <!-- test source dir -->
- <pathelement path="${src}/test"/>
- <!-- blocks source dirs -->
- <dirset dir="${blocks}">
- <include name="*/trunk/java"/>
- <include name="*/trunk/test"/>
- <include name="*/trunk/java${target.vm}"/>
- </dirset>
- <!-- garbage has its own layout -->
- <pathelement path="${src}/blocks/scratchpad/trunk/garbage/source/java"/>
- </path>
-
- <path id="mockss">
- <dirset dir="${src}">
- <include name="mocks"/>
- <include name="blocks/*/trunk/mocks"/>
- <!-- exclude xsp mocks that redefine classes in session-fw -->
- <exclude name="blocks/xsp/trunk/mocks"/>
- </dirset>
- </path>
-
- <path id="libs">
- <!-- main libs -->
- <fileset dir="${lib}">
- <include name="core/*.jar"/>
- <!-- Currently, we have no JVM dependent libraries
- <include name="core/jvm${target.vm}/*.jar"/>
- -->
- <include name="optional/*.jar"/>
- <include name="local/*.jar"/>
- <include name="endorsed/*.jar"/>
- </fileset>
- <!-- blocks lib -->
- <fileset dir="${blocks}">
- <include name="*/trunk/*/*.jar"/>
- <exclude name="*/trunk/target/*.jar"/>
- </fileset>
- <!-- tools libs -->
- <fileset dir="${tools}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- convert paths to properties -->
- <property name="srcs" refid="srcs"/>
- <property name="mockss" refid="mockss"/>
- <property name="libs" refid="libs"/>
-
- <!-- expand properties in the template file -->
- <copy file="${tools}/ide/eclipse/classpath-tmpl.xml"
- tofile="${build.temp}/classpath-temp.xml"
- filtering="yes"
- overwrite="yes">
- <filterset>
- <filter token="SRC_DIRS" value="${srcs}"/>
- <filter token="LIBS" value="${libs}"/>
- <filter token="MOCKS_DIRS" value="${mockss}"/>
- <filter token="OUTPUT_DIR" value="${ide.eclipse.outputdir}"/>
- </filterset>
- </copy>
-
- <!-- split the path in 'item' XML elements -->
- <replace file="${build.temp}/classpath-temp.xml"
- token="${path.separator}" value="</item>
 <item>"/>
- <!-- relativize file names by removing the current directory -->
- <replace file="${build.temp}/classpath-temp.xml"
- token="${user}${file.separator}" value=""/>
- <!-- and in case that fails, remove the base directory -->
- <replace file="${build.temp}/classpath-temp.xml"
- token="${basedir}${file.separator}" value=""/>
-
- <!-- replace platform-dependent path separator by '/' -->
- <replace file="${build.temp}/classpath-temp.xml"
- token="${file.separator}" value="/"/>
-
- <!-- now build the .classpath file -->
- <xslt in="${build.temp}/classpath-temp.xml" out="${basedir}/.classpath"
- processor="trax"
- style="${tools}/ide/eclipse/make-classpath.xsl">
- <param name="exportlib" expression="${ide.eclipse.export.libs}"/>
- </xslt>
-
- <!-- copy the project file (expand version) -->
- <copy file="${tools}/ide/eclipse/project"
- tofile="${basedir}/.project"
- overwrite="yes">
- <filterset>
- <filter token="VERSION" value="${version}"/>
</filterset>
</copy>
</target>