diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-10-17 08:15:22 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-10-17 08:15:22 +0000 |
| commit | 63903a82203205643c8ae245533179fa0b1767cc (patch) | |
| tree | 4f87beb03e2b934a98587cbd354da6cfd871fb47 /install-win32/buildinstaller | |
| parent | 51f7b8487b67dd5fbca3794b76919df878c03fb6 (diff) | |
| download | openvpn-63903a82203205643c8ae245533179fa0b1767cc.tar.gz openvpn-63903a82203205643c8ae245533179fa0b1767cc.tar.xz openvpn-63903a82203205643c8ae245533179fa0b1767cc.zip | |
Modified Windows domake-win build system to write all openvpn.nsi
input files to gen, so that gen can be disconnected from
the rest of the source tree and makensis openvpn.nsi will
still function correctly.
Added additional SAMPCONF_(CA|CRT|KEY) macros to settings.in
(commented out by default).
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3439 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'install-win32/buildinstaller')
| -rw-r--r-- | install-win32/buildinstaller | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/install-win32/buildinstaller b/install-win32/buildinstaller index d906edf..83057bb 100644 --- a/install-win32/buildinstaller +++ b/install-win32/buildinstaller @@ -4,19 +4,11 @@ . autodefs/defs.sh # build the installer -cd install-win32 -rm -f *.exe -'/c/Program Files/NSIS/makensis' openvpn.nsi &>makensis.log +rm -f $GENOUT/*.exe +'/c/Program Files/NSIS/makensis' $GENOUT/nsi/openvpn.nsi &>makensis.log tail -20 makensis.log -# copy the installer to GENOUT/install -ls openvpn*.exe 2>/dev/null || exit 1 -i=`ls -t openvpn*.exe | head -n 1` -cd .. -mkdir $GENOUT/install &>/dev/null -cp install-win32/$i $GENOUT/install - # sign the installer if [ -d "$SIGNTOOL" ]; then - TARGET_EXE="$(pwd)/$GENOUT/install/$i" $SIGNTOOL/signexe + TARGET_EXE="$(echo $(pwd)/$GENOUT/*.exe)" $SIGNTOOL/signexe fi |