Instead of deleting the empty directory placeholders, let's just not copy them to pkg-temp to begin with.

This commit is contained in:
kytv
2012-12-21 20:53:51 +00:00
parent 05c5f66012
commit c9b6a3f01c
3 changed files with 1 additions and 8 deletions

View File

@@ -867,7 +867,7 @@
<!-- Eepsite stuff here -->
<mkdir dir="pkg-temp/eepsite" />
<copy todir="pkg-temp/eepsite/" >
<fileset dir="installer/resources/eepsite/" />
<fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" />
</copy>
<copy todir="pkg-temp/eepsite/docroot/help/lib/" >
<fileset dir="installer/resources/icons/flags/" includes="cn.png de.png es.png fr.png ir.png it.png jp.png nl.png ru.png se.png us.png" />

View File

@@ -196,12 +196,6 @@
<args><arg value="$INSTALL_PATH/man" /></args></executable>
<executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH/locale" /></args></executable>
<executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH\eepsite\webapps\.placeholder" /></args></executable>
<executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH\eepste\logs\.placeholder" /></args></executable>
<executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH\eepsite\cgi-bin\.placeholder" /></args></executable>
<!-- Placeholder for an OSX 'shortcut' to the router console
<executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH/I2P Router Console.webloc" /></args></executable>

View File

@@ -117,7 +117,6 @@ rm -f ./lib/*.dll
rm -f ./*.bat
rm -f ./*.cmd
rm -f ./*.exe
rm -f ./eepsite/*/.placeholder
rm -rf ./installer
if [ ! `echo $HOST_OS |grep osx` ]; then