[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia.spec, 1.27, 1.28

David Walluck david at ryu.zarb.org
Wed Oct 12 04:38:10 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv23469

Modified Files:
	maven-doxia.spec 
Log Message:
- update build

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** maven-doxia.spec	12 Oct 2011 02:35:07 -0000	1.27
--- maven-doxia.spec	12 Oct 2011 02:38:08 -0000	1.28
***************
*** 181,193 ****
  %patch6 -p1 -b .sav6
  
- %if 0
- cp %{SOURCE7} settings.xml
- sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
- sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
- sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
- %endif
- 
- %build
- 
  %if %{with_maven}
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
--- 181,184 ----
***************
*** 198,221 ****
  %endif
  
! mvn-jpp \
!         -e \
! %if 0
!         -s ${M2_SETTINGS} \
! %endif
!         -Dmaven2.jpp.depmap.file=%{SOURCE6} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven.test.failure.ignore=true \
!         install 
! 
! mvn-jpp \
!         -e \
!         -s ${M2_SETTINGS} \
!         -Dmaven2.jpp.depmap.file=%{SOURCE6} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Daggregate=true \
!         javadoc:javadoc
! 
  %else
- 
  mkdir lib
  build-jar-repository -s -p lib/ \
--- 189,197 ----
  %endif
  
! export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
! export MAVEN_OPTS="-Xms1g -Xmx1g"
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dmaven2.jpp.depmap.file=%{SOURCE6} -Dmaven.test.skip=true -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy javadoc:aggregate
  %else
  mkdir lib
  build-jar-repository -s -p lib/ \




More information about the JPackage-commits mailing list