[Jpackage-commits] dist/buildmagic/JPP-6 .cvsignore, 1.3, 1.4 buildmagic-library-classpath.patch, 1.1, 1.2 buildmagic.spec, 1.8, 1.9 sources, 1.3, 1.4

David Walluck david at ryu.zarb.org
Fri Jul 10 22:09:57 CEST 2009


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

Modified Files:
	.cvsignore buildmagic-library-classpath.patch buildmagic.spec 
	sources 
Log Message:
- 2.1.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/buildmagic/JPP-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** .cvsignore	14 Jan 2009 17:42:42 -0000	1.3
--- .cvsignore	10 Jul 2009 20:09:55 -0000	1.4
***************
*** 1 ****
! buildmagic-2.0.1.tar.bz2
--- 1 ----
! buildmagic-2.1.0.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/buildmagic/JPP-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** sources	14 Jan 2009 17:42:42 -0000	1.3
--- sources	10 Jul 2009 20:09:55 -0000	1.4
***************
*** 1 ****
! 6e1a4f5de889752a79897197e0dbba42  buildmagic-2.0.1.tar.bz2
--- 1 ----
! d4bd10e3c9baa6a08102b82f267dc4cc  buildmagic-2.1.0.tar.bz2

Index: buildmagic-library-classpath.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/buildmagic/JPP-6/buildmagic-library-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** buildmagic-library-classpath.patch	14 Jan 2009 19:00:14 -0000	1.1
--- buildmagic-library-classpath.patch	10 Jul 2009 20:09:55 -0000	1.2
***************
*** 1,4 ****
! --- buildmagic-2.0.1/tools/etc/buildmagic/defaults.ent.orig	2008-09-19 10:02:41.923638000 -0400
! +++ buildmagic-2.0.1/tools/etc/buildmagic/defaults.ent	2009-01-14 13:53:02.426783409 -0500
  @@ -104,7 +104,7 @@
   
--- 1,4 ----
! --- buildmagic-2.1.0/tools/etc/buildmagic/defaults.ent.orig	2009-03-06 13:56:39.000000000 -0500
! +++ buildmagic-2.1.0/tools/etc/buildmagic/defaults.ent	2009-06-29 11:24:46.351004929 -0400
  @@ -104,7 +104,7 @@
   

Index: buildmagic.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/buildmagic/JPP-6/buildmagic.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** buildmagic.spec	14 Jan 2009 19:35:31 -0000	1.8
--- buildmagic.spec	10 Jul 2009 20:09:55 -0000	1.9
***************
*** 34,44 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with bootstrap
  
  %define section free
  
  Name:           buildmagic
! Version:        2.0.1
! Release:        2%{?dist}
  Epoch:          0
  Summary:        JBoss buildmagic tasks module
--- 34,44 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without bootstrap
  
  %define section free
  
  Name:           buildmagic
! Version:        2.1.0
! Release:        1%{?dist}
  Epoch:          0
  Summary:        JBoss buildmagic tasks module
***************
*** 46,63 ****
  Group:          Development/Libraries/Java
  URL:            http://www.jboss.org/
! # svn export http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/buildmagic/tags/buildmagic-2.0.1
! # tar cjf buildmagic-2.0.1.tar.bz2 buildmagic-2.0.1
! Source0:        buildmagic-2.0.1.tar.bz2
! Patch0:         buildmagic-no-jboss-common-classes.patch
! Patch1:         buildmagic-ant17.patch
! Patch2:         buildmagic-httpurl.patch
! Patch3:         buildmagic-jmxdoclet.patch
! Patch4:         buildmagic-bsf.patch
! Patch5:         buildmagic-maven-repo.patch
! Patch6:         buildmagic-library-classpath.patch
  Provides:       %{name}-tasks = %{epoch}:%{version}-%{release}
  Requires:       bsf
! Requires:       log4j
! BuildRequires:  ant >= 0:1.6
  BuildRequires:  ant-junit
  BuildRequires:  ant-nodeps
--- 46,57 ----
  Group:          Development/Libraries/Java
  URL:            http://www.jboss.org/
! # 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
  Requires:       bsf
! Requires:       jboss-common-core
! BuildRequires:  ant
  BuildRequires:  ant-junit
  BuildRequires:  ant-nodeps
***************
*** 66,77 ****
  BuildRequires:  buildmagic
  %endif
! BuildRequires:  dom4j
! BuildRequires:  gnu-regexp
! BuildRequires:  jakarta-commons-httpclient
! BuildRequires:  jakarta-slide-webdavclient
! BuildRequires:  jpackage-utils >= 0:1.6
  BuildRequires:  junit
- BuildRequires:  log4j
- BuildRequires:  xdoclet
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
--- 60,66 ----
  BuildRequires:  buildmagic
  %endif
! BuildRequires:  jboss-common-core
! BuildRequires:  jpackage-utils
  BuildRequires:  junit
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
***************
*** 82,125 ****
  %prep
  %setup -q
- %if %with bootstrap
  %patch0 -p1
- %endif
- %patch1 -p1
- %patch2 -p1
- %patch3 -p1
- %patch4 -p1
- %patch5 -p1
- %patch6 -p1
- 
  find . -type f -name "*.jar" | xargs -t rm
! 
! %if %with bootstrap
! %{__mkdir_p} tasks/src/main/org/jboss/util/file
! %{__mkdir_p} tasks/src/main/org/jboss/util/platform
! %{__mkdir_p} tasks/src/main/org/jboss/util/stream
! %{__mkdir_p} tasks/src/main/org/jboss/logging
! %{__cp} -p common/src/main/org/jboss/util/DirectoryBuilder.java tasks/src/main/org/jboss/util
! %{__cp} -p common/src/main/org/jboss/util/Strings.java tasks/src/main/org/jboss/util
! %{__sed} -i -e 's/org\.jboss\.util\.platform\.Constants\.LINE_SEPARATOR/System.getProperty("line.separator")/' tasks/src/main/org/jboss/util/Strings.java
! %{__cp} -p common/src/main/org/jboss/util/NestedError.java tasks/src/main/org/jboss/util
! %{__cp} -p common/src/main/org/jboss/util/NestedThrowable.java tasks/src/main/org/jboss/util
! %{__cp} -p common/src/main/org/jboss/util/ThrowableHandler.java tasks/src/main/org/jboss/util
! %{__cp} -p common/src/main/org/jboss/util/ThrowableListener.java tasks/src/main/org/jboss/util
! %{__cp} -p common/src/main/org/jboss/util/NullArgumentException.java tasks/src/main/org/jboss/util
! %{__cp} -p common/src/main/org/jboss/util/EmptyStringException.java tasks/src/main/org/jboss/util
! %{__cp} -p common/src/main/org/jboss/util/file/Files.java tasks/src/main/org/jboss/util/file
! %{__cp} -p common/src/main/org/jboss/util/platform/Java.java tasks/src/main/org/jboss/util/platform
! %{__cp} -p common/src/main/org/jboss/util/stream/Streams.java tasks/src/main/org/jboss/util/stream
! %{__cp} -p common/src/main/org/jboss/logging/Logger.java tasks/src/main/org/jboss/logging
! %{__cp} -p common/src/main/org/jboss/logging/LoggerPlugin.java tasks/src/main/org/jboss/logging
! %{__cp} -p common/src/main/org/jboss/logging/NullLoggerPlugin.java tasks/src/main/org/jboss/logging
! %else
! %{__ln_s} $(build-classpath buildmagic) tools/lib/buildmagic-tasks.jar
! %endif
  
  %build
! export CLASSPATH=$(build-classpath bsf log4j)
! export OPT_JAR_LIST="ant/ant-nodeps junit ant/ant-junit"
! export CLASSPATH=${CLASSPATH}:`pwd`/tasks/common/output/classes
  %if %with bootstrap
  pushd tasks
--- 71,83 ----
  %prep
  %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
! %{__rm} tasks/src/test/org/jboss/tools/buildmagic/task/ResolvePropertiesTestCase.java
  
  %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
***************
*** 147,151 ****
          -Dbuild.lib=common/output/lib \
          -Dbuild.test=common/output/test \
!         -Dbuild.report=common/output/reports \
          -Dmodule.source=src \
          -Dmodule.output=common/output \
--- 105,109 ----
          -Dbuild.lib=common/output/lib \
          -Dbuild.test=common/output/test \
!         -Dbuild.reports=common/output/reports \
          -Dmodule.source=src \
          -Dmodule.output=common/output \
***************
*** 159,171 ****
  %endif
  
- XDOCLET_CLASSES=$(build-classpath xdoclet/xdoclet xdoclet/xdoclet-jmx-module xjavadoc jakarta-commons-collections jakarta-commons-logging)
- export CLASSPATH=${CLASSPATH}:`pwd`/tasks/output/lib/buildmagic-tasks.jar:$(build-classpath dom4j gnu-regexp jakarta-commons-httpclient slide/jakarta-slide-webdavlib junit):${XDOCLET_CLASSES}
  %if %with bootstrap
! export CLASSPATH=${CLASSPATH}:`pwd`/common/output/classes
  %else
  export CLASSPATH=${CLASSPATH}:$(build-classpath buildmagic-tasks)
  %endif
  pushd build
! %{ant} -Dant.version="`%{_bindir}/ant -version`" -Dbuild.sysclasspath=first
  popd
  
--- 117,127 ----
  %endif
  
  %if %with bootstrap
! export CLASSPATH=${CLASSPATH}:$(pwd)/tasks/common/output/lib/buildmagic-tasks.jar
  %else
  export CLASSPATH=${CLASSPATH}:$(build-classpath buildmagic-tasks)
  %endif
  pushd build
! %{ant} -Dbuild.sysclasspath=first
  popd
  
***************
*** 190,193 ****
--- 146,152 ----
  
  %changelog
+ * Fri Jul 10 2009 David Walluck <dwalluck at redhat.com> 0:2.1.0-1
+ - 2.1.0
+ 
  * Wed Jan 14 2009 David Walluck <dwalluck at redhat.com> 0:2.0.1-2
  - rebuild as non-bootstrap




More information about the JPackage-commits mailing list