Skip to content

Commit abe0dab

Browse files
committed
check package files existence before creating them
1 parent f7b3f7f commit abe0dab

File tree

1 file changed

+32
-2
lines changed

1 file changed

+32
-2
lines changed

build.xml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,18 +517,48 @@ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
517517
</java>
518518
</target>
519519

520-
<target name="package" depends="jar">
520+
<target name="-check-svr4-package" description="Check that Solaris SVR4 package exists">
521+
<!-- XXX dist should be ${dist.dir} -->
522+
<available file="dist/OSOLopengrok-${version}.pkg" type="file"
523+
property="svr4_package_exists">
524+
</available>
525+
<condition property="svr4_package_missing">
526+
<not>
527+
<isset property="svr4_package_exists"/>
528+
</not>
529+
</condition>
530+
</target>
531+
532+
<target name="package-svr4" depends="-check-svr4-package,jar" if="svr4_package_missing">
521533
<exec os="SunOS" executable="/usr/bin/pkgmk" failonerror="true">
522534
<arg line="-o -d build -r . -v ${version} -f platform/solaris/pkgdef/prototype"/>
523535
</exec>
524536
<exec os="SunOS" executable="/usr/bin/pkgtrans" failonerror="true">
525537
<arg line="-s build ../dist/OSOLopengrok-${version}.pkg OSOLopengrok"/>
526538
</exec>
539+
</target>
540+
541+
<target name="-check-ips-package" description="Check that Solaris IPS package exists">
542+
<!-- XXX dist should be ${dist.dir} -->
543+
<available file="dist/opengrok-${version}.p5p" type="file"
544+
property="ips_package_exists">
545+
</available>
546+
<condition property="ips_package_missing">
547+
<not>
548+
<isset property="ips_package_exists"/>
549+
</not>
550+
</condition>
551+
</target>
552+
553+
<target name="package-ips" depends="-check-ips-package,jar" if="ips_package_missing">
527554
<exec os="SunOS" executable="platform/solaris/ips/create.sh" failonerror="true">
528555
<arg line="-v ${version}"/>
529556
</exec>
530557
</target>
531558

559+
<target name="package" depends="package-svr4,package-ips">
560+
</target>
561+
532562
<target name="dist" depends="jar">
533563
<tar destfile="${dist.dir}/${tardest}"
534564
compression="gzip">
@@ -756,7 +786,7 @@ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
756786
</not>
757787
</condition>
758788
</target>
759-
789+
760790
<target name="check_plugins_jar" description="check if plugins.jar was generated">
761791
<available
762792
file="${build.test.classes.dir}/org/opensolaris/opengrok/authorization/plugins.jar"

0 commit comments

Comments
 (0)