- don't include pics folder items in distributable

- correct the template format for mktemp
This commit is contained in:
myk
2013-02-23 03:25:58 +00:00
parent b5732d0194
commit 7c2f17c78c
2 changed files with 3 additions and 1 deletions

View File

@@ -887,6 +887,7 @@
<include name="res/**" /> <include name="res/**" />
<exclude name="res/cardsfolder/**" /> <exclude name="res/cardsfolder/**" />
<exclude name="res/lib/**" /> <exclude name="res/lib/**" />
<exclude name="res/pics/**" />
</fileset> </fileset>
<fileset dir="${project.build.directory}" includes="forge.exe" /> <fileset dir="${project.build.directory}" includes="forge.exe" />
<fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" /> <fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
@@ -1000,6 +1001,7 @@
<include name="res/**" /> <include name="res/**" />
<exclude name="res/cardsfolder/**" /> <exclude name="res/cardsfolder/**" />
<exclude name="res/lib/**" /> <exclude name="res/lib/**" />
<exclude name="res/pics/**" />
</javafileset> </javafileset>
<javafileset dir="${project.build.directory}"> <javafileset dir="${project.build.directory}">
<include name="res/cardsfolder/cardsfolder.zip" /> <include name="res/cardsfolder/cardsfolder.zip" />

View File

@@ -128,7 +128,7 @@ if ! test -z "$BACKGROUND_FILE"; then
fi fi
# run applescript # run applescript
APPLESCRIPT=$(mktemp -t createdmg) APPLESCRIPT=$(mktemp -t createdmg.XXXXX)
cat "$AUX_PATH/template.applescript" | sed -e "s/WINX/$WINX/g" -e "s/WINY/$WINY/g" -e "s/WINW/$WINW/g" -e "s/WINH/$WINH/g" -e "s/BACKGROUND_CLAUSE/$BACKGROUND_CLAUSE/g" -e "s/ICON_SIZE/$ICON_SIZE/g" | perl -pe "s/POSITION_CLAUSE/$POSITION_CLAUSE/g" >"$APPLESCRIPT" cat "$AUX_PATH/template.applescript" | sed -e "s/WINX/$WINX/g" -e "s/WINY/$WINY/g" -e "s/WINW/$WINW/g" -e "s/WINH/$WINH/g" -e "s/BACKGROUND_CLAUSE/$BACKGROUND_CLAUSE/g" -e "s/ICON_SIZE/$ICON_SIZE/g" | perl -pe "s/POSITION_CLAUSE/$POSITION_CLAUSE/g" >"$APPLESCRIPT"
echo "Running Applescript: /usr/bin/osascript \"${APPLESCRIPT}\" \"${VOLUME_NAME}\"" echo "Running Applescript: /usr/bin/osascript \"${APPLESCRIPT}\" \"${VOLUME_NAME}\""