Skip to content

Commit e4984e1

Browse files
author
dlsmith
committed
Reverted Mac release packaging to use tar/gzip rather than zip. It's less convenient, but zip permissions don't seem to be supported in 10.4 and previous. Misc cleanup of build.xml (renamed "local-release", etc., to "release-local"; "skip-clean", "skip-tag", and "skip-test" now all work the same; ...)
git-svn-id: file:///tmp/test-svn/trunk@4441 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent b304294 commit e4984e1

1 file changed

Lines changed: 50 additions & 63 deletions

File tree

‎drjava/build.xml‎

Lines changed: 50 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@
140140
<echo message=" setting the property 'plt.error.log'; default: popup)" />
141141
<echo message="clean-can-fail: Whether the failure of a 'clean' operation can halt" />
142142
<echo message=" the build (default: yes)" />
143-
<echo message="skip-tag: When making a release, add -Dskip-tag=true to avoid" />
144-
<echo message=" creating a new tag in the Subversion repository." />
145143
</target>
146144

147145

@@ -399,21 +397,21 @@
399397
<target name="test" depends="test-15" description="Shortcut for 'test-15'">
400398
</target>
401399

402-
<target name="test-15" depends="compile-15"
400+
<target name="test-15" depends="compile-15" unless="skip-test"
403401
description="Run all 5.0 tests under Java 5.0 (after compiling); use -Dtest-spec=... to filter">
404402
<antcall target="iterate-tests">
405403
<param name="do-test-target" value="do-test-15" />
406404
</antcall>
407405
</target>
408406

409-
<target name="test-14" depends="compile-14"
407+
<target name="test-14" depends="compile-14" unless="skip-test"
410408
description="Run all 1.4 tests under Java 1.4 (after compiling); use -Dtest-spec=... to filter">
411409
<antcall target="iterate-tests">
412410
<param name="do-test-target" value="do-test-14" />
413411
</antcall>
414412
</target>
415413

416-
<target name="test-14-in-15" depends="compile-14, assert-15"
414+
<target name="test-14-in-15" depends="compile-14, assert-15" unless="skip-test"
417415
description="Run all 1.4 tests under Java 5.0 (after compiling); use -Dtest-spec=... to filter">
418416
<antcall target="iterate-tests">
419417
<param name="do-test-target" value="do-test-14-in-15" />
@@ -1011,24 +1009,16 @@
10111009
</exec>
10121010
</target>
10131011

1014-
<target name="tag" depends="update, resolve-version-tag"
1012+
<target name="tag" depends="update, resolve-version-tag" unless="skip-tag"
10151013
description="Copy the working copy to a new Subversion tag (after updating)">
1016-
<if>
1017-
<equals arg1="${skip-tag}" arg2="true" />
1018-
<then>
1019-
<echo message="SKIPPING: Creating a new Subversion tag with name ${version-tag}"/>
1020-
</then>
1021-
<else>
1022-
<echo message="Creating a new Subversion tag with name ${version-tag}"/>
1023-
<exec executable="svn" failonerror="yes">
1024-
<arg value="copy" />
1025-
<arg value="${basedir}" />
1026-
<arg value="${svn-repository}/tags/${version-tag}" />
1027-
<arg value="-m" />
1028-
<arg value="Created tag ${version-tag}" />
1029-
</exec>
1030-
</else>
1031-
</if>
1014+
<echo message="Creating a new Subversion tag with name ${version-tag}"/>
1015+
<exec executable="svn" failonerror="yes">
1016+
<arg value="copy" />
1017+
<arg value="${basedir}" />
1018+
<arg value="${svn-repository}/tags/${version-tag}" />
1019+
<arg value="-m" />
1020+
<arg value="Created tag ${version-tag}" />
1021+
</exec>
10321022
</target>
10331023

10341024
<target name="branch" depends="update"
@@ -1053,23 +1043,41 @@
10531043
Release Targets
10541044
*************** -->
10551045

1056-
<target name="release-stable" description="Generate all release files tagged with 'stable' and create a Subversion tag for this release">
1046+
<target name="release-stable" description="Generate release files with a 'stable' version; create a corresponding Subversion tag">
10571047
<antcall target="release">
10581048
<param name="tag-append" value="-stable" />
10591049
<param name="is-development" value="no" />
10601050
</antcall>
10611051
</target>
10621052

1063-
<target name="release-beta" description="Generate all release files tagged with 'beta' and create a Subversion tag for this release">
1053+
<target name="release-beta" description="Generate release files with a 'beta' version; create a corresponding Subversion tag">
10641054
<antcall target="release">
10651055
<param name="tag-append" value="-beta" />
10661056
<param name="is-development" value="no" />
10671057
</antcall>
10681058
</target>
10691059

1060+
<target name="release-local-stable" description="Generate release files with a 'stable' version (does not touch Subversion)">
1061+
<antcall target="release-stable">
1062+
<param name="skip-tag" value="true" />
1063+
</antcall>
1064+
</target>
1065+
1066+
<target name="release-local-beta" description="Generate release files with a 'beta' version (does not touch Subversion)">
1067+
<antcall target="release-beta">
1068+
<param name="skip-tag" value="true" />
1069+
</antcall>
1070+
</target>
1071+
1072+
<target name="release-local" description="Generate release files with a devel version (does not touch Subversion)">
1073+
<antcall target="release">
1074+
<param name="skip-tag" value="true" />
1075+
</antcall>
1076+
</target>
1077+
10701078
<target name="release"
10711079
depends="update, build, tag, src-zip, jar-app, mac-app, windows-app, javadoc-zip"
1072-
description="Generate all release files (after building) and create a Subversion tag for this release">
1080+
description="Generate release files with a devel version; create a corresponding Subversion tag">
10731081
<delete dir="${version-tag}" />
10741082
</target>
10751083

@@ -1088,7 +1096,14 @@
10881096
</copy>
10891097
<copy file="${ant.project.name}.jar"
10901098
todir="${mac-app-dir}/${readable-project-name}.app/Contents/Resources/Java" />
1091-
<zip destfile="${version-tag}-osx.zip" basedir="${mac-app-dir}" />
1099+
<!-- A .zip file would be more convenient, because it unzips in one step. Unfortunately,
1100+
permissions in .zip files don't seem to be supported before OS X 10.5. -->
1101+
<tar tarfile="${version-tag}-osx.tar.gz" compression="gzip">
1102+
<tarfileset dir="${mac-app-dir}" includes="${readable-project-name}.app/**"
1103+
excludes="${readable-project-name}.app/Contents/MacOS/${readable-project-name}" />
1104+
<tarfileset dir="${mac-app-dir}" mode="755"
1105+
includes="${readable-project-name}.app/Contents/MacOS/${readable-project-name}" />
1106+
</tar>
10921107
</target>
10931108

10941109
<target name="windows-app" depends="assert-jar-exists, assert-launch4j-exists, resolve-version-tag">
@@ -1112,27 +1127,16 @@
11121127
includes="${readable-project-name}.exe" />
11131128
</target>
11141129

1115-
<target name="src-zip" depends="resolve-version-tag">
1130+
<target name="src-zip" depends="resolve-version-tag" unless="skip-tag">
11161131
<echo message="Creating ${version-tag}-src.zip" />
1117-
<if>
1118-
<equals arg1="${skip-tag}" arg2="true" />
1119-
<then>
1120-
<zip destfile="${version-tag}-src.zip">
1121-
<zipfileset dir="src" prefix="${version-tag}/src" />
1122-
</zip>
1123-
</then>
1124-
<else>
1125-
<echo message="Creating a new Subversion tag with name ${version-tag}"/>
1126-
<exec executable="svn" failonerror="yes">
1127-
<arg value="export" />
1128-
<arg value="${svn-repository}/tags/${version-tag}" />
1129-
<arg value="${version-tag}/src" />
1130-
</exec>
1131-
<zip destfile="${version-tag}-src.zip">
1132-
<zipfileset dir="${version-tag}/src" prefix="${version-tag}/src" />
1133-
</zip>
1134-
</else>
1135-
</if>
1132+
<exec executable="svn" failonerror="yes">
1133+
<arg value="export" />
1134+
<arg value="${svn-repository}/tags/${version-tag}" />
1135+
<arg value="${version-tag}/src" />
1136+
</exec>
1137+
<zip destfile="${version-tag}-src.zip">
1138+
<zipfileset dir="${version-tag}/src" prefix="${version-tag}/src" />
1139+
</zip>
11361140
</target>
11371141

11381142
<target name="javadoc-zip" depends="javadoc, resolve-version-tag">
@@ -1152,24 +1156,7 @@
11521156
</zip>
11531157
</target>
11541158

1155-
<target name="local-release-stable" description="Generate all release files tagged with 'stable', but do not touch the Subversion repository">
1156-
<antcall target="release-stable">
1157-
<param name="skip-tag" value="true" />
1158-
</antcall>
1159-
</target>
11601159

1161-
<target name="local-release-beta" description="Generate all release files tagged with 'beta', but do not touch the Subversion repository">
1162-
<antcall target="release-beta">
1163-
<param name="skip-tag" value="true" />
1164-
</antcall>
1165-
</target>
1166-
1167-
<target name="local-release" description="Generate all release files (after building), but do not touch the Subversion repository">
1168-
<antcall target="release">
1169-
<param name="skip-tag" value="true" />
1170-
</antcall>
1171-
</target>
1172-
11731160
<!-- ********************************
11741161
Misc Occasionally-Useful Targets
11751162
******************************** -->

0 commit comments

Comments
 (0)