Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1877 - in infrastructure/scarab: . scarab-dpml-extensions

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: pneubauer AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1877 - in infrastructure/scarab: . scarab-dpml-extensions
  • Date: Tue, 22 Feb 2005 21:10:02 +0100

Author: pneubauer
Date: Tue Feb 22 21:10:01 2005
New Revision: 1877

Modified:
infrastructure/scarab/build.xml
infrastructure/scarab/scarab-dpml-extensions/scarab-build-patch.txt
Log:
one more patch for scrab build process, builds now and works!


Modified: infrastructure/scarab/build.xml
==============================================================================
--- infrastructure/scarab/build.xml (original)
+++ infrastructure/scarab/build.xml Tue Feb 22 21:10:01 2005
@@ -10,7 +10,7 @@
<available property="scarab.present" file="scarab/build/build.xml" />
</target>

- <target name="build-scarab" depends="prepare, checkout-scarab,
patch-scarab" >
+ <target name="prepare-scarab" depends="prepare, checkout-scarab,
patch-scarab" >
<echo file="scarab/build.properties">
scarab.database.name=scarab
scarab.database.username=issues
@@ -28,7 +28,9 @@
RegisterUser=Register me as User
RegisterCommitter=Register me as Committer
</echo>
- <ant dir="scarab/build" inheritrefs="false" inheritall="false"/>
+ </target>
+ <target name="build-scarab" depends="prepare-scarab">
+ <ant dir="scarab/build" inheritrefs="false" inheritall="false"/>
<mkdir dir="${dpml.cache}/scarab/jars/" />
<jar destfile="${dpml.cache}/scarab/jars/scarab-SNAPSHOT.jar"
basedir="scarab/target/scarab/WEB-INF/classes/"

Modified: infrastructure/scarab/scarab-dpml-extensions/scarab-build-patch.txt
==============================================================================
--- infrastructure/scarab/scarab-dpml-extensions/scarab-build-patch.txt
(original)
+++ infrastructure/scarab/scarab-dpml-extensions/scarab-build-patch.txt Tue
Feb 22 21:10:01 2005
@@ -1,48 +1,13 @@
-Index: src/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
-===================================================================
---- src/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
(revision 9419)
-+++ src/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
(working copy)
-@@ -152,7 +152,12 @@
- */
- public String getCustom()
- {
-- return (customFile==null)? null:customFile.getAbsolutePath();
-+ String result = null;
-+ if ( customFile != null )
-+ {
-+ result = customFile.getAbsolutePath();
-+ }
-+ return result;
- }
-
- /**
-Index: src/java/org/tigris/scarab/util/build/AntPropertyFileGenerator.java
-===================================================================
---- src/java/org/tigris/scarab/util/build/AntPropertyFileGenerator.java
(revision 9419)
-+++ src/java/org/tigris/scarab/util/build/AntPropertyFileGenerator.java
(working copy)
-@@ -149,9 +149,7 @@
- }
- catch (FileNotFoundException e)
- {
-- throw new BuildException("the template["
-- + generator.getTemplate()
-- + "] does not exist.");
-+ throw new BuildException( "File not found: " + e.getMessage() );
- }
- catch (IOException e)
- {
Index: build/build.xml
===================================================================
---- build/build.xml (revision 9419)
+--- build/build.xml (revision 9422)
+++ build/build.xml (working copy)
-@@ -267,8 +267,8 @@
-
classname="org.tigris.scarab.util.build.AntPropertyFileGenerator"
- classpath="${build.project.webinf}/classes"/>
+@@ -269,7 +269,7 @@
<defaultCustom
-- custom =
"${build.project.webinf}/conf/defaultCustom.properties"
-- template = "${custom.properties.tmpl}"
-+ custom =
"${basedir}/${build.project.webinf}/conf/defaultCustom.properties"
-+ template = "${basedir}/${custom.properties.tmpl}"
- properties =
"${user.home}/scarab.${configuration.file}:${user.home}/${configuration.file}:${root.dir}/${configuration.file}:${root.dir}/project.properties"

+ custom =
"${basedir}/${build.project.webinf}/conf/defaultCustom.properties"
+ template = "${basedir}/${custom.properties.tmpl}"
+- properties =
"${user.home}/scarab.${configuration.file}:${user.home}/${configuration.file}:${root.dir}/${configuration.file}:${root.dir}/project.properties"

++ properties =
"${user.home}/scarab.${configuration.file}:${user.home}/${configuration.file}:${basedir}/${root.dir}/${configuration.file}:${basedir}/${root.dir}/project.properties"

/>

+ </target>



  • svn commit: r1877 - in infrastructure/scarab: . scarab-dpml-extensions, pneubauer, 02/22/2005

Archive powered by MHonArc 2.6.24.

Top of Page