Changeset c9b6a3f0


Ignore:
Timestamp:
Dec 21, 2012 8:53:51 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
8998bde
Parents:
05c5f66
Message:

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r05c5f66 rc9b6a3f0  
    868868        <mkdir dir="pkg-temp/eepsite" />
    869869        <copy todir="pkg-temp/eepsite/" >
    870             <fileset dir="installer/resources/eepsite/" />
     870            <fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" />
    871871        </copy>
    872872        <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
  • installer/install.xml

    r05c5f66 rc9b6a3f0  
    197197            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    198198                <args><arg value="$INSTALL_PATH/locale" /></args></executable>
    199             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    200                 <args><arg value="$INSTALL_PATH\eepsite\webapps\.placeholder" /></args></executable>
    201             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    202                 <args><arg value="$INSTALL_PATH\eepste\logs\.placeholder" /></args></executable>
    203             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    204                 <args><arg value="$INSTALL_PATH\eepsite\cgi-bin\.placeholder" /></args></executable>
    205199            <!-- Placeholder for an OSX 'shortcut' to the router console
    206200            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
  • installer/resources/postinstall.sh

    r05c5f66 rc9b6a3f0  
    118118rm -f ./*.cmd
    119119rm -f ./*.exe
    120 rm -f ./eepsite/*/.placeholder
    121120rm -rf ./installer
    122121
Note: See TracChangeset for help on using the changeset viewer.