From d2b6584ef0d688c743a41e1f7bdf8d736f72d477 Mon Sep 17 00:00:00 2001
From: bancika <bancika@ACC-BSTOJKOVIC.ACCORDIA.LOCAL>
Date: Thu, 12 May 2016 18:08:38 +0200
Subject: [PATCH] osx zip file access fixed

---
 .../diylc-swing/build.xml                     | 59 ++++++++-----------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/build.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/build.xml
index 1471a0a4..b7649e79 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/build.xml	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/build.xml	
@@ -1,5 +1,5 @@
-<project name="diylc-swing" basedir="." default="complete">	
-	
+<project name="diylc-swing" basedir="." default="complete">
+
 	<property name="src.dir" value="src" />
 
 	<property name="lib.dir" value="${basedir}/lib" />
@@ -18,11 +18,11 @@
 
 	<!--change src dir-->
 	<target name="compile">
-		<ant antfile="../diylc-library/build.xml" target="jar" inheritAll="false"/>
+		<ant antfile="../diylc-library/build.xml" target="jar" inheritAll="false" />
 		<mkdir dir="${classes.dir}" />
 		<echo>Compile with JDK ${java.runtime.version}</echo>
 		<javac encoding="8859_1" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="class.path">
-			<compilerarg value="-proc:none"/>
+			<compilerarg value="-proc:none" />
 		</javac>
 	</target>
 
@@ -70,52 +70,43 @@
 			</manifest>
 		</jar>
 	</target>
-	
-	<target name="mac" depends="jar"> 
-		<taskdef name="jarbundler" classname="net.sourceforge.jarbundler.JarBundler" />		
-		<jarbundler bundleid="org.diylc"
-				dir="${jar.dir}"				
-	            name="DIYLC"
-				version="${diylc.version}"
-	            mainclass="${main.class}" 	            
-				stubfile="JavaApplicationStub"
-				vmoptions="-Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true"
-				icon="icons/diylc.icns"
-				workingdirectory="$APP_PACKAGE/Contents/Resources"
-				infostring="DIY Layout Creator by bancika (diy-fever.com)">	
+
+	<target name="mac" depends="jar">
+		<taskdef name="jarbundler" classname="net.sourceforge.jarbundler.JarBundler" />
+		<jarbundler bundleid="org.diylc" dir="${jar.dir}" name="DIYLC" version="${diylc.version}" mainclass="${main.class}" stubfile="JavaApplicationStub" vmoptions="-Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true" icon="icons/diylc.icns" workingdirectory="$APP_PACKAGE/Contents/Resources" infostring="DIY Layout Creator by bancika (diy-fever.com)">
 			<jarfileset dir="${jar.dir}">
 				<include name="diylc.jar" />
 				<include name="lib/**/*.jar" />
 				<include name="library/**/*.jar" />
-			</jarfileset>	
+			</jarfileset>
 			<resourcefileset dir="${basedir}">
 				<include name="update.xml" />
 				<include name="templates**/*.diy" />
 				<include name="themes**/*.xml" />
 			</resourcefileset>
-			<javaproperty name="apple.laf.useScreenMenuBar" value="true"/>
+			<javaproperty name="apple.laf.useScreenMenuBar" value="true" />
 			<!--<documenttype name="DIYLC Project"
 			                    extensions="diylc" 
 			                    role="Editor"/>-->
-		</jarbundler>			
+		</jarbundler>
 	</target>
-	
+
 	<target name="complete" depends="mac">
 		<zip destfile="${build.dir}/diylc-${diylc.version}.zip">
-				    <fileset dir="${jar.dir}" includes="diylc.jar"/>
-				    <zipfileset dir="${jar.dir}/lib" prefix="lib"/>
-					<zipfileset dir="${jar.dir}/library/" prefix="library"/>
-					<zipfileset dir="templates" prefix="templates"/>
-					<zipfileset dir="themes" prefix="themes"/>
-					<zipfileset dir="." includes="update.xml"/>
-					<zipfileset dir="." includes="run.sh"/>
-					<zipfileset dir="." includes="diylc.l4j.ini"/>
-					<zipfileset dir="." includes="associations.bat"/>
-					<zipfileset dir="." includes="diylc.exe"/>
-				  </zip>
+			<zipfileset dir="${jar.dir}" includes="diylc.jar" />
+			<zipfileset dir="${jar.dir}/lib" prefix="lib" />
+			<zipfileset dir="${jar.dir}/library/" prefix="library" />
+			<zipfileset dir="templates" prefix="templates" />
+			<zipfileset dir="themes" prefix="themes" />
+			<zipfileset dir="." includes="update.xml" />
+			<zipfileset dir="." includes="run.sh" />
+			<zipfileset dir="." includes="diylc.l4j.ini" />
+			<zipfileset dir="." includes="associations.bat" />
+			<zipfileset dir="." includes="diylc.exe" />
+		</zip>
 		<zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip">
-			 <zipfileset dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app"/>
-			</zip>
+			<zipfileset filemode="755" dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app" />
+		</zip>
 	</target>
 
 	<target name="javadoc">