You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2009/09/12 03:18:15 UTC
svn commit: r814101 - in /lucene/solr/trunk: build.xml common-build.xml

Author: ryan
Date: Sat Sep 12 01:18:14 2009
New Revision: 814101

URL: http://svn.apache.org/viewvc?rev=814101&view=rev
Log:
SOLR-1424 -- fixing ant generate-maven-artifacts on windows

Modified:
    lucene/solr/trunk/build.xml
    lucene/solr/trunk/common-build.xml

Modified: lucene/solr/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/build.xml?rev=814101&r1=814100&r2=814101&view=diff
==============================================================================
--- lucene/solr/trunk/build.xml (original)
+++ lucene/solr/trunk/build.xml Sat Sep 12 01:18:14 2009
@@ -747,7 +747,7 @@
 
       <!-- ========== SOLR PARENT POM ========== -->
 
-      <m2-deploy pom.xml="${src}/maven/solr-parent-pom.xml.template"/>
+      <m2-deploy pom.xml="src/maven/solr-parent-pom.xml.template"/>
 
       <!-- ========== SOLR SPECIFIC LUCENE ARTIFACTS ========== -->
 
@@ -815,7 +815,7 @@
       <!-- TODO: MORE NEEDED HERE ONCE WE FINALIZE THE LIBS FOR CARROT -->
       <!-- end clustering specific -->
 
-      <m2-deploy pom.xml="${src}/maven/solr-core-pom.xml.template"
+      <m2-deploy pom.xml="src/maven/solr-core-pom.xml.template"
                  jar.file="${dist}/apache-solr-core-${version}.jar">
 
         <artifact-attachments>
@@ -825,7 +825,7 @@
 
       </m2-deploy>
 
-      <m2-deploy pom.xml="${src}/maven/solr-solrj-pom.xml.template"
+      <m2-deploy pom.xml="src/maven/solr-solrj-pom.xml.template"
                  jar.file="${dist}/apache-solr-solrj-${version}.jar">
 
         <artifact-attachments>

Modified: lucene/solr/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/common-build.xml?rev=814101&r1=814100&r2=814101&view=diff
==============================================================================
--- lucene/solr/trunk/common-build.xml (original)
+++ lucene/solr/trunk/common-build.xml Sat Sep 12 01:18:14 2009
@@ -253,6 +253,7 @@
    </sequential>
   </macrodef>
 
+  <!-- NOTE, the pom.xml MUST be a relative path.  An absolute path may break the build on windows -->
   <macrodef name="m2-deploy" description="Builds a Maven artifact">
         <element name="artifact-attachments" optional="yes"/>
     <attribute name="pom.xml" default="${pom.xml}"/>