Skip to content

Commit 9c90b7b

Browse files
author
mgricken
committed
Fixed nested properties in attributes.
Reverted broken build. D packaging/mac A packaging/DrJava.app A packaging/DrJava.app/Contents A packaging/DrJava.app/Contents/MacOS A packaging/DrJava.app/Contents/MacOS/DrJava A packaging/DrJava.app/Contents/Info.plist A packaging/DrJava.app/Contents/Resources A packaging/DrJava.app/Contents/Resources/Java A packaging/DrJava.app/Contents/Resources/Java/DrJava.jar-goes-here A packaging/DrJava.app/Contents/Resources/DrJava.icns A packaging/DrJava.app/Contents/PkgInfo D packaging/windows A packaging/WinExecutorForDrJava.exe M src/edu/rice/cs/drjava/ui/ExecuteExternalDialog.java M src/edu/rice/cs/util/StringOps.java M build.xml git-svn-id: file:///tmp/test-svn/trunk@4382 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent 9ae8e49 commit 9c90b7b

File tree

11 files changed

+41
-50
lines changed

11 files changed

+41
-50
lines changed

‎drjava/build.xml‎

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
<!-- Don't use or inherit the CLASSPATH environment variable for anything -->
1010
<property name="build.sysclasspath" value="ignore" />
1111

12-
<property environment="env" />
13-
<property name="java14-home" value="${env.JAVA14_HOME}" />
14-
<property name="clover-jar" value="${env.CLOVER_JAR}" />
15-
<property name="launch4j-home" value="${env.LAUNCH4J_HOME}" />
16-
<property name="findbugs-home" value="${env.FINDBUGS_HOME}" />
17-
1812
<!-- Extension containing various tools, including "for" and "if" -->
1913
<taskdef resource="net/sf/antcontrib/antlib.xml" classpath="lib/buildlib/ant-contrib.jar"/>
2014

@@ -28,20 +22,12 @@
2822
<taskdef resource="com/cenqua/ant/antlib.xml" classpath="lib/buildlib/cenquatasks.jar" />
2923

3024
<!-- fornum task, used for test-repeat -->
31-
<taskdef name="fornum" classname="edu.rice.cs.plt.ant.ForNumTask" classpath="lib/buildlib/plt-ant.jar" onerror="report" />
32-
33-
<!-- findbugs task -->
34-
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="lib/buildlib/findbugs-ant.jar" />
35-
36-
<!-- launch4j task, used to create the Windows executable -->
37-
<taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask">
38-
<classpath>
39-
<pathelement location="${launch4j-home}/launch4j.jar" />
40-
<pathelement location="${launch4j-home}/lib/xstream.jar" />
41-
</classpath>
42-
</taskdef>
25+
<taskdef name="fornum" classname="edu.rice.cs.plt.ant.ForNumTask" classpath="lib/buildlib/plt-ant.jar" onerror="report"/>
4326

4427
<extendclasspath path="lib/buildlib/junit.jar" />
28+
<extendclasspath path="lib/buildlib/findbugs-ant.jar" />
29+
30+
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
4531

4632
<!-- Load the property file if it exists -->
4733
<if>
@@ -62,6 +48,10 @@
6248
<property name="is-development" value="yes" /> <!-- Development or stable release -->
6349
<property name="tag-append" value="" /> <!-- "stable", "beta", or none -->
6450

51+
<property environment="env" />
52+
<property name="java14-home" value="${env.JAVA14_HOME}" />
53+
<property name="clover-jar" value="${env.CLOVER_JAR}" />
54+
6555
<!-- Default settings for properties -->
6656
<property name="test-spec" value="*" />
6757
<property name="test-repeat" value="1" />
@@ -99,9 +89,6 @@
9989
<echo message="JAVA14_HOME: Home folder of the Java 1.4 JRE or J2SDK" />
10090
<echo message="PATH: 'svn' needs to refer to the Subversion client executable" />
10191
<echo message="CLOVER_JAR: Location of the Clover jar file" />
102-
<echo message="FINDBUGS_HOME: Location of the FindBugs installation" />
103-
<echo message="LAUNCH4J_HOME: Location of the Launch4j installation (used to " />
104-
<echo message=" generate a Windows application)." />
10592
<echo message="" />
10693
<echo message="Ant may also require the following, depending on your platform:" />
10794
<echo message="JAVA_HOME: Location of the JDK (many targets here require Java 5+)" />
@@ -633,7 +620,7 @@
633620
<fail message="FindBugs installation not found, or FINDBUGS_HOME environment variable not set."
634621
unless="findbugs-exists" />
635622
<delete file="${basedir}/findbugs.html" />
636-
<findbugs home="${findbugs-home}"
623+
<findbugs home="${env.FINDBUGS_HOME}"
637624
output="html"
638625
jvmargs="-Xmx512M"
639626
failOnError="true"
@@ -928,14 +915,20 @@
928915
<delete dir="benchmarkSources" failonerror="${clean-can-fail}" />
929916
<delete dir="benchmarkResults" failonerror="${clean-can-fail}" />
930917

931-
<delete includeemptydirs="true" failonerror="${clean-can-fail}">
918+
<delete failonerror="${clean-can-fail}">
932919
<fileset dir="testFiles">
933920
<exclude name="**" />
934921
<!-- Additional test output files should be listed here -->
935922
</fileset>
923+
</delete>
924+
925+
<delete includeemptydirs="true" failonerror="${clean-can-fail}">
936926
<fileset dir="${basedir}">
937927
<patternset refid="generated-sources" />
938928
</fileset>
929+
</delete>
930+
931+
<delete includeemptydirs="true" failonerror="${clean-can-fail}">
939932
<fileset dir="${basedir}" defaultexcludes="no">
940933
<include name="TEST*" />
941934
<include name="src/**/*.class" />
@@ -950,7 +943,7 @@
950943
</delete>
951944

952945
</target>
953-
946+
954947
<target name="clean-products" unless="skip-clean">
955948
<echo message="Deleting all final build products" />
956949

@@ -961,10 +954,11 @@
961954
<include name="*.jar" />
962955
<include name="*.zip" />
963956
<include name="*.tar.gz" />
964-
<include name="findbugs.html" />
957+
<include name="${ant.project.name}-*" />
965958
</fileset>
966959
</delete>
967-
960+
961+
<delete file="${basedir}/findbugs.html" />
968962
</target>
969963

970964

@@ -1065,25 +1059,29 @@
10651059
<mkdir dir="${mac-app-dir}" />
10661060
<filter token="VERSION" value="${version-tag}" />
10671061
<copy todir="${mac-app-dir}/${readable-project-name}.app" filtering="yes" >
1068-
<fileset dir="packaging/mac/${readable-project-name}.app" excludes="**/*jar-goes-here" />
1062+
<fileset dir="packaging/${readable-project-name}.app" excludes="**/*jar-goes-here" />
10691063
</copy>
10701064
<copy file="${ant.project.name}.jar"
10711065
todir="${mac-app-dir}/${readable-project-name}.app/Contents/Resources/Java" />
1072-
<zip destfile="${version-tag}-osx.zip" basedir="${mac-app-dir}" />
1066+
<tar tarfile="${mac-app-dir}/${version-tag}-osx.tar">
1067+
<tarfileset dir="${mac-app-dir}" includes="${readable-project-name}.app/**"
1068+
excludes="${readable-project-name}.app/Contents/MacOS/${readable-project-name}" />
1069+
<tarfileset dir="${mac-app-dir}" mode="755"
1070+
includes="${readable-project-name}.app/Contents/MacOS/${readable-project-name}" />
1071+
</tar>
1072+
<gzip src="${mac-app-dir}/${version-tag}-osx.tar" destfile="${version-tag}-osx.tar.gz" />
10731073
</target>
10741074

10751075
<target name="windows-app" depends="assert-jar-exists, resolve-version-tag">
1076-
<echo message="Creating ${version-tag}-windows.zip" />
1077-
<property name="windows-app-dir" value="${version-tag}/windows" />
1078-
<mkdir dir="${windows-app-dir}" />
1079-
<filter token="VERSION" value="${version-tag}" />
1080-
<copy todir="${windows-app-dir}" filtering="yes" >
1081-
<fileset dir="packaging/windows" />
1082-
</copy>
1083-
<copy file="${ant.project.name}.jar" todir="${windows-app-dir}" />
1084-
<launch4j configfile="${windows-app-dir}/launch4j-config.xml" />
1085-
<zip destfile="${version-tag}-windows.zip" basedir="${windows-app-dir}"
1086-
includes="${readable-project-name}.exe" />
1076+
<echo message="Creating ${version-tag}.exe" />
1077+
<concat destfile="${version-tag}.exe" binary="yes">
1078+
<filelist dir="${basedir}">
1079+
<!-- TODO: This should probably include WinExecutor.exe and the icon file
1080+
rather than using the generated WinExecutorFor... -->
1081+
<file name="packaging/WinExecutorFor${readable-project-name}.exe" />
1082+
<file name="${ant.project.name}.jar" />
1083+
</filelist>
1084+
</concat>
10871085
</target>
10881086

10891087
<target name="src-zip" depends="resolve-version-tag">

drjava/packaging/mac/DrJava.app/Contents/Info.plist renamed to drjava/packaging/DrJava.app/Contents/Info.plist

File renamed without changes.

drjava/packaging/mac/DrJava.app/Contents/MacOS/DrJava renamed to drjava/packaging/DrJava.app/Contents/MacOS/DrJava

File renamed without changes.

drjava/packaging/mac/DrJava.app/Contents/PkgInfo renamed to drjava/packaging/DrJava.app/Contents/PkgInfo

File renamed without changes.

drjava/packaging/mac/DrJava.app/Contents/Resources/DrJava.icns renamed to drjava/packaging/DrJava.app/Contents/Resources/DrJava.icns

File renamed without changes.

drjava/packaging/mac/DrJava.app/Contents/Resources/Java/DrJava.jar-goes-here renamed to drjava/packaging/DrJava.app/Contents/Resources/Java/DrJava.jar-goes-here

File renamed without changes.

‎drjava/packaging/WinExecutorForDrJava.exe‎

96.5 KB
Binary file not shown.

‎drjava/packaging/windows/drjava.ico‎

-5.87 KB
Binary file not shown.

‎drjava/packaging/windows/launch4j-config.xml‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎drjava/src/edu/rice/cs/drjava/ui/ExecuteExternalDialog.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,6 +1122,7 @@ public void run() {
11221122
BalancingStreamTokenizer atok = new BalancingStreamTokenizer(new StringReader(attrList), '$');
11231123
atok.wordRange(0,255);
11241124
atok.addQuotes("\"", "\"");
1125+
atok.addQuotes("\"", "\"");
11251126
atok.addKeyword(";");
11261127
atok.addKeyword("=");
11271128
// LOG.log("\tProcessing AttrList");

0 commit comments

Comments
 (0)