From: <ppi...@us...> - 2012-02-27 17:36:21
|
Revision: 12662 http://unicore.svn.sourceforge.net/unicore/?rev=12662&view=rev Author: ppiernik Date: 2012-02-27 17:36:14 +0000 (Mon, 27 Feb 2012) Log Message: ----------- fix package.config.dir problem, canl javadoc Modified Paths: -------------- tools/packaging_tools/trunk/packman/main.xml Modified: tools/packaging_tools/trunk/packman/main.xml =================================================================== --- tools/packaging_tools/trunk/packman/main.xml 2012-02-27 16:41:06 UTC (rev 12661) +++ tools/packaging_tools/trunk/packman/main.xml 2012-02-27 17:36:14 UTC (rev 12662) @@ -389,7 +389,7 @@ <!--rpm target --> <target name="set-spec-additions"> <property name="preamble" value="BuildRequires: subversion ${line.separator}BuildRequires: maven ${line.separator}BuildRequires: java-1.6.0-openjdk-devel ${line.separator}Source0 : ${package.prefix}${component.package.name}${package.suffix}-${package.version}-${package.release}.src.tar.gz" /> - <property name="install_command" value="%prep ${line.separator}%setup -q -c . ${line.separator}%build${line.separator}%install ${line.separator}rm -rf $RPM_BUILD_ROOT ${line.separator}mkdir -p $RPM_BUILD_ROOT ${line.separator}${pre.src.rpm.command} ${line.separator}mvn -q package -Ppackman -Dmaven.test.skip -Dmaven.repo.local=`pwd`/maven-repo -Dpackage.version=${package.version} -Dpackage.release=${package.release} -Ddistribution=${distribution} -Dpackage.type=prep.src.rpm -DindexJars -B; ${line.separator}cp -r target/${distribution}/RPMS/builddir/* $RPM_BUILD_ROOT ${line.separator}%clean ${line.separator}rm -rf $RPM_BUILD_ROOT${line.separator}" /> + <property name="install_command" value="%prep ${line.separator}%setup -q -c . ${line.separator}%build${line.separator}%install ${line.separator}rm -rf $RPM_BUILD_ROOT ${line.separator}mkdir -p $RPM_BUILD_ROOT ${line.separator}${pre.src.rpm.command} ${line.separator}mvn -q package -Ppackman -Dmaven.test.skip -Dmaven.repo.local=`pwd`/maven-repo -Dpackage.version=${package.version} -Dpackage.release=${package.release} -Ddistribution=${distribution} -Dpackage.config.dir=${package.config.dir} -Dpackage.type=prep.src.rpm -DindexJars -B; ${line.separator}cp -r target/${distribution}/RPMS/builddir/* $RPM_BUILD_ROOT ${line.separator}%clean ${line.separator}rm -rf $RPM_BUILD_ROOT${line.separator}" /> </target> @@ -500,7 +500,7 @@ </target> <target name="set-src-rules-additions" depends="set-rules-additions"> <!--<property name="build_command" value="mkdir ${package.prefix}${component.package.name}${package.suffix}_src;tar -zxf ${package.prefix}${component.package.name}${package.suffix}_${package.version}-${package.release}.orig.tar.gz -C ${package.prefix}${component.package.name}${package.suffix}_src;cd ${package.prefix}${component.package.name}${package.suffix}_src;${pre.src.deb.command}${pre.src.deb.postfix}mvn -q package -Ppackman -Dmaven.test.skip -Dmaven.repo.local=`pwd`/maven-repo -Dpackage.version=${package.version} -Dpackage.release=${package.release} -Ddistribution=${distribution} -Dpackage.type=prep.src.deb -DindexJars -B;cp -R target/${distribution}${distribution.builddir} $(DEB_BUILD_ROOT)/${package.prefix}${component.package.name}${package.suffix}" /> --> - <property name="build_command" value="${pre.src.deb.command}${pre.src.deb.postfix}mvn -q package -Ppackman -Dmaven.test.skip -Dmaven.repo.local=`pwd`/maven-repo -Dpackage.version=${package.version} -Dpackage.release=${package.release} -Ddistribution=${distribution} -Dpackage.type=prep.src.deb -DindexJars -B -Dskip.os.detect;cp -R target/${distribution}${distribution.builddir} $(DEB_BUILD_ROOT)/${package.prefix}${component.package.name}${package.suffix}" /> + <property name="build_command" value="${pre.src.deb.command}${pre.src.deb.postfix}mvn -q package -Ppackman -Dmaven.test.skip -Dmaven.repo.local=`pwd`/maven-repo -Dpackage.version=${package.version} -Dpackage.release=${package.release} -Ddistribution=${distribution} -Dpackage.type=prep.src.deb -Dpackage.config.dir=${package.config.dir} -DindexJars -B -Dskip.os.detect;cp -R target/${distribution}${distribution.builddir} $(DEB_BUILD_ROOT)/${package.prefix}${component.package.name}${package.suffix}" /> <property name="build_depends" value="Build-Depends: debhelper (>= 7.0.50~),openjdk-6-jdk (>= 6b18-1.8.2-4),maven2 (>=2.2.1-5),ant (>=1.8.0-4),subversion ${line.separator}" /> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |