[Jpackage-commits] dist/buildmagic/JPP-6 buildmagic-2.1.0-ivy-offline.patch, NONE, 1.1 buildmagic-ant17.patch, 1.1, NONE buildmagic-bsf.patch, 1.1, NONE buildmagic-httpurl.patch, 1.3, NONE buildmagic-jmxdoclet.patch, 1.2, NONE buildmagic-library-classpath.patch, 1.2, NONE buildmagic-maven-repo.patch, 1.1, NONE buildmagic-no-jboss-common-classes.patch, 1.2, NONE buildmagic.spec, 1.10, 1.11

David Walluck david at ryu.zarb.org
Fri Jul 10 23:40:53 CEST 2009


Update of /home/projects/jpackage/cvs/dist/buildmagic/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv3969

Modified Files:
	buildmagic.spec 
Added Files:
	buildmagic-2.1.0-ivy-offline.patch 
Removed Files:
	buildmagic-ant17.patch buildmagic-bsf.patch 
	buildmagic-httpurl.patch buildmagic-jmxdoclet.patch 
	buildmagic-library-classpath.patch buildmagic-maven-repo.patch 
	buildmagic-no-jboss-common-classes.patch 
Log Message:
- try to make ivy stay offline

--- buildmagic-ant17.patch DELETED ---

--- buildmagic-jmxdoclet.patch DELETED ---

--- buildmagic-no-jboss-common-classes.patch DELETED ---

--- buildmagic-bsf.patch DELETED ---

--- NEW FILE: buildmagic-2.1.0-ivy-offline.patch ---
--- buildmagic-2.1.0/tasks/build.xml.orig	2009-03-06 13:56:39.000000000 -0500
+++ buildmagic-2.1.0/tasks/build.xml	2009-07-10 16:37:08.976662417 -0400
@@ -205,8 +205,10 @@
     <property name="dist.root" location="output/buildmagic"/>
     <mkdir dir="${dist.root}/lib"/>
     <copy file="${build.lib}/buildmagic-tasks.jar" tofile="${dist.root}/lib/buildmagic-tasks.jar"/>
-    
+
+<!--    
     <ivy:retrieve pattern="${dist.root}/lib/[artifact]-[revision].[ext]" conf="compile"/>
+-->
     
     <mkdir dir="${dist.root}/etc"/>
     <copy todir="${dist.root}/etc">
--- buildmagic-2.1.0/tools/etc/ivy/ivysettings.xml.orig	2009-07-10 17:33:28.133675180 -0400
+++ buildmagic-2.1.0/tools/etc/ivy/ivysettings.xml	2009-07-10 17:34:29.595546946 -0400
@@ -1,12 +1,9 @@
 <ivysettings>
-  <settings defaultResolver="jboss-releases" checkUpToDate="false"/>
+  <settings defaultResolver="jpackage-releases" checkUpToDate="false"/>
   <caches useOrigin="true"/>
   <resolvers>
-    <url name="jboss-releases" m2compatible="true">
-      <artifact pattern="http://repository.jboss.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
-    </url>
-    <url name="maven-central" m2compatible="true">
-      <artifact pattern="http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+    <url name="jpackage-releases" m2compatible="false">
+      <artifact pattern="file:/usr/share/java/[artifact].[ext]" />
     </url>
   </resolvers>
 </ivysettings>

--- buildmagic-httpurl.patch DELETED ---

--- buildmagic-maven-repo.patch DELETED ---

Index: buildmagic.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/buildmagic/JPP-6/buildmagic.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** buildmagic.spec	10 Jul 2009 20:17:25 -0000	1.10
--- buildmagic.spec	10 Jul 2009 21:40:51 -0000	1.11
***************
*** 48,52 ****
  # svn export -q http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/buildmagic/tags/buildmagic-2.1.0 && tar cjf buildmagic-2.1.0.tar.bz2 buildmagic-2.1.0
  Source0:        buildmagic-2.1.0.tar.bz2
! Patch0:         buildmagic-library-classpath.patch
  Provides:       %{name}-tasks = %{epoch}:%{version}-%{release}
  Requires:       ant
--- 48,52 ----
  # svn export -q http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/buildmagic/tags/buildmagic-2.1.0 && tar cjf buildmagic-2.1.0.tar.bz2 buildmagic-2.1.0
  Source0:        buildmagic-2.1.0.tar.bz2
! Patch0:         buildmagic-2.1.0-ivy-offline.patch
  Provides:       %{name}-tasks = %{epoch}:%{version}-%{release}
  Requires:       ant
***************
*** 73,77 ****
  %setup -q
  %patch0 -p1
! find . -type f -name "*.jar" | xargs -t rm
  %{__rm} tasks/src/it/simple-external-build/module1/src/main/org/jboss/buildmagic/test/HelloModule1.java
  %{__rm} tasks/src/it/simple-external-build/module2/src/main/org/jboss/buildmagic/test/HelloModule2.java
--- 73,79 ----
  %setup -q
  %patch0 -p1
! %{_bindir}/find -type f -name "*.jar" | xargs -t %{__rm}
! %{__rm} -r tools/ant
! %{__rm} -r tools/apache-ivy
  %{__rm} tasks/src/it/simple-external-build/module1/src/main/org/jboss/buildmagic/test/HelloModule1.java
  %{__rm} tasks/src/it/simple-external-build/module2/src/main/org/jboss/buildmagic/test/HelloModule2.java
***************
*** 80,87 ****
  %build
  export OPT_JAR_LIST=$(%{__cat} %{_sysconfdir}/ant.d/{junit,nodeps})
! export CLASSPATH=$(build-classpath apache-ivy bsf jboss-common-core)
  %if %with bootstrap
  pushd tasks
  %{ant} \
          -Djavac.optimize=off \
          -Djavac.source=1.4 \
--- 82,90 ----
  %build
  export OPT_JAR_LIST=$(%{__cat} %{_sysconfdir}/ant.d/{junit,nodeps})
! export CLASSPATH=$(build-classpath apache-ivy jboss-common-core)
  %if %with bootstrap
  pushd tasks
  %{ant} \
+         -Divy.default.ivy.user.dir=$(pwd) \
          -Djavac.optimize=off \
          -Djavac.source=1.4 \
***************
*** 113,117 ****
          -Dinit.disable=true \
          -Ddependency-manager.offline=true \
!         -Dbuild.sysclasspath=only \
          output
  popd
--- 116,120 ----
          -Dinit.disable=true \
          -Ddependency-manager.offline=true \
!         -Dbuild.sysclasspath=first \
          output
  popd
***************
*** 124,128 ****
  %endif
  pushd build
! %{ant} -Dbuild.sysclasspath=first
  popd
  
--- 127,131 ----
  %endif
  pushd build
! %{ant} -Divy.default.ivy.user.dir=$(pwd) -Dbuild.sysclasspath=first
  popd
  

--- buildmagic-library-classpath.patch DELETED ---




More information about the JPackage-commits mailing list