[xiph-commits] r15552 - trunk/oggdsf/build/NSIS/Release

[cristianadam at svn.xiph.org]

Author: cristianadam
Date: 2008-12-02 15:47:57 -0800 (Tue, 02 Dec 2008)
New Revision: 15552

Added:
   trunk/oggdsf/build/NSIS/Release/make_cab.cmd
Modified:
   trunk/oggdsf/build/NSIS/Release/build.cmd
   trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi
Log:
Fixed inclusion of 64 bit manifest file in installer. Added cab packaging support in build.cmd

Modified: trunk/oggdsf/build/NSIS/Release/build.cmd
===================================================================
--- trunk/oggdsf/build/NSIS/Release/build.cmd	2008-12-02 23:13:01 UTC (rev 15551)
+++ trunk/oggdsf/build/NSIS/Release/build.cmd	2008-12-02 23:47:57 UTC (rev 15552)
@@ -26,3 +26,8 @@
 
 signtool sign /a /t http://time.certum.pl/ oggcodecs_%PRODUCT_VERSION%-%SUFFIX%.exe 
 "%ProgramFiles%\7-zip\7z.exe" a oggcodecs_%PRODUCT_VERSION%_pdbs-%SUFFIX%.7z pdb\*
+
+rmdir /s /q "Ogg Codecs"
+"%ProgramFiles%\7-zip\7z.exe" e oggcodecs_%PRODUCT_VERSION%-%SUFFIX%.exe -o"Ogg Codecs"
+call make_cab.cmd oggcodecs_%PRODUCT_VERSION%-%SUFFIX%
+signtool sign /a /t http://time.certum.pl/ oggcodecs_%PRODUCT_VERSION%-%SUFFIX%.cab

Added: trunk/oggdsf/build/NSIS/Release/make_cab.cmd
===================================================================
--- trunk/oggdsf/build/NSIS/Release/make_cab.cmd	                        (rev 0)
+++ trunk/oggdsf/build/NSIS/Release/make_cab.cmd	2008-12-02 23:47:57 UTC (rev 15552)
@@ -0,0 +1,12 @@
+ at echo off
+cd "Ogg Codecs"
+del LangDLL.dll nsDialogs.dll StartMenu.dll System.dll uninst.exe modern-header.bmp modern-wizard.bmp xifish.ico 
+cd ..
+
+for %%i in ("Ogg Codecs\*.*") do echo "%cd%\%%i" >> files.ddf
+makecab /L .  /D CompresionMemory=21 /D CompressionType=LZX  /D DestinationDir="Ogg Codecs" /F files.ddf 
+del files.ddf
+move disk1\1.cab "%1.cab"
+rmdir disk1
+del setup.inf
+del setup.rpt

Modified: trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi
===================================================================
--- trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi	2008-12-02 23:13:01 UTC (rev 15551)
+++ trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi	2008-12-02 23:47:57 UTC (rev 15552)
@@ -344,7 +344,11 @@
   File "${OGGCODECS_ROOT_DIR}\AUTHORS"
   File "${OGGCODECS_ROOT_DIR}\HISTORY"
   File "${OGGCODECS_ROOT_DIR}\ChangeLog.txt"
+!if "$%X64%" == "true"
+  File "${OGGCODECS_ROOT_DIR}\bin\x64\Ogg Codecs.manifest" 
+!else
   File "${OGGCODECS_ROOT_DIR}\bin\Ogg Codecs.manifest" 
+!endif
   
   ; Install Filters - 16