Skip to content

Commit 5babcff

Browse files
committed
Update Ant build.xml to use 7zip instead of zip ant task
The Ant task started producing broken zip files with the final contents. Using '7z' executable instead.
1 parent 1140083 commit 5babcff

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

MSFragger-GUI/build.xml

+13-2
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,21 @@
106106

107107
<delete dir="${temp.dir}"/>
108108

109-
<zip destfile="${store.zip}" level="0" fallbacktoutf8="true" createUnicodeExtraFields="always">
109+
<!-- this zip action is now not working well, chaning it to 7z -->
110+
<!-- <zip destfile="${store.zip}" level="0" fallbacktoutf8="true" createUnicodeExtraFields="always">
110111
<fileset dir="${store.dir}" includes="*.jar"/>
111112
<fileset dir="start-scripts"/>
112-
</zip>
113+
</zip> -->
114+
115+
<!-- the actual name of the 7zip executable might be different on linux -->
116+
<property name="7zip" value="7z" />
117+
<exec executable="${7zip}">
118+
<arg value="a"/>
119+
<arg value="${store.zip}"/>
120+
<arg value="./${store.dir}/*.jar"/>
121+
<arg value="./start-scripts/*"/>
122+
</exec>
123+
113124

114125
</target>
115126

MSFragger-GUI/nbproject/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ manifest.custom.permissions=
107107
manifest.file=manifest.mf
108108
meta.inf.dir=${src.dir}/META-INF
109109
mkdist.disabled=false
110-
platform.active=JDK_1.8
110+
platform.active=JDK_1.7
111111
project.license=apache20
112112
run.classpath=\
113113
${javac.classpath}:\

0 commit comments

Comments
 (0)