Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Now using Unix 'zip' for generating the ZIP packages. Eliminates dependency on external 7-Zip and allows for adding an archive comment.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-01-08 21:43:24 +01:00
parent ffb16e4b31
commit d29f292264
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/Deployment/_deploy.bat
View File

@ -84,6 +84,7 @@ REM ------------------------------------------
del "%OUT_FILE%.exe"
del "%OUT_FILE%.sfx"
del "%OUT_FILE%.zip"
del "%OUT_FILE%.txt"
REM ------------------------------------------
if exist "%OUT_FILE%.exe" (
call "%~dp0\_error.bat" "FAILD TO DELET EXISTING FILE"
@ -147,7 +148,18 @@ attrib +R "%TMP_PATH%\*.exe"
REM ------------------------------------------
REM :: CREATE PACKAGES ::
REM ------------------------------------------
"%PATH_SEVENZ%\7z.exe" a -tzip -r "%OUT_FILE%.zip" "%TMP_PATH%\*"
"%~dp0\..\Utilities\Echo.exe" LameXP - Audio Encoder Front-End > "%OUT_FILE%.txt"
"%~dp0\..\Utilities\Echo.exe" v%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO% %VER_LAMEXP_TYPE%-%VER_LAMEXP_PATCH% (Build #%VER_LAMEXP_BUILD%)\n >> "%OUT_FILE%.txt"
"%~dp0\..\Utilities\Echo.exe" Built on %ISO_DATE% at %TIME%\n\n >> "%OUT_FILE%.txt"
"%~dp0\..\Utilities\Echo.exe" ---------------------------\nREADME.TXT\n--------------------------- >> "%OUT_FILE%.txt"
"%~dp0\..\Utilities\Cat.exe" "%~dp0\..\..\ReadMe.txt" >> "%OUT_FILE%.txt"
"%~dp0\..\Utilities\Echo.exe" \n\n---------------------------\nLICENSE.TXT\n---------------------------\n >> "%OUT_FILE%.txt"
"%~dp0\..\Utilities\Cat.exe" "%~dp0\..\..\License.txt" >> "%OUT_FILE%.txt"
REM ------------------------------------------
pushd "%TMP_PATH%"
"%~dp0\..\Utilities\Zip.exe" -r -9 -z "%OUT_FILE%.zip" "*.*" < "%OUT_FILE%.txt"
popd
REM ------------------------------------------
"%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.sfx" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "%~dp0\..\NSIS\setup.nsi"
"%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.exe" "/DLAMEXP_SOURCE_FILE=%OUT_FILE%.sfx" "%~dp0\..\NSIS\wrapper.nsi"
REM ------------------------------------------

4
etc/Deployment/_paths.bat
View File

@ -1,7 +1,6 @@
@echo off
set "LAMEXP_ERROR=1"
REM ------------------------------------------
set "PATH_SEVENZ="
set "PATH_UPXBIN="
set "PATH_MKNSIS="
set "PATH_MSCDIR="
@ -24,7 +23,6 @@ if not exist "%BUILDENV_TXT%" (
)
REM ------------------------------------------
for /f "tokens=2,*" %%s in (%BUILDENV_TXT%) do (
if "%%s"=="PATH_SEVENZ" set "PATH_SEVENZ=%%~t"
if "%%s"=="PATH_UPXBIN" set "PATH_UPXBIN=%%~t"
if "%%s"=="PATH_MKNSIS" set "PATH_MKNSIS=%%~t"
if "%%s"=="PATH_MSCDIR" set "PATH_MSCDIR=%%~t"
@ -36,7 +34,6 @@ REM ------------------------------------------
set "BUILDENV_TXT="
REM ------------------------------------------
echo === BEGIN PATHS ===
echo PATH_SEVENZ = "%PATH_SEVENZ%"
echo PATH_UPXBIN = "%PATH_UPXBIN%"
echo PATH_MKNSIS = "%PATH_MKNSIS%"
echo PATH_MSCDIR = "%PATH_MSCDIR%"
@ -47,7 +44,6 @@ echo === END PATHS ===
REM ------------------------------------------
set "LAMEXP_ERROR=1"
REM ------------------------------------------
if not exist "%PATH_SEVENZ%\7z.exe" GOTO:EOF
if not exist "%PATH_UPXBIN%\upx.exe" GOTO:EOF
if not exist "%PATH_MKNSIS%\makensis.exe" GOTO:EOF
if not exist "%PATH_MSCDIR%\VC\vcvarsall.bat" GOTO:EOF

1
etc/Deployment/buildenv.template.txt
View File

@ -1,4 +1,3 @@
#define PATH_SEVENZ "C:\Program Files\7-Zip"
#define PATH_UPXBIN "C:\Program Files\UPX"
#define PATH_MKNSIS "C:\Program Files\NSIS\Unicode"
#define PATH_MSCDIR "C:\Program Files\Microsoft Visual Studio 12.0"

BIN
etc/Utilities/Cat.exe Normal file
View File

Binary file not shown.

BIN
etc/Utilities/Echo.exe Normal file
View File

Binary file not shown.

BIN
etc/Utilities/Zip.exe Normal file
View File

Binary file not shown.

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 9
#define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 1
#define VER_LAMEXP_BUILD 1514
#define VER_LAMEXP_BUILD 1515
#define VER_LAMEXP_CONFG 1348
///////////////////////////////////////////////////////////////////////////////