[Mp-plugins-svn] SF.net SVN: mp-plugins:[2598] trunk/plugins/IR Server Suite

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2598
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2598&view=rev
Author:   chef_koch
Date:     2009-02-03 17:39:03 +0000 (Tue, 03 Feb 2009)

Log Message:
-----------
Documentation is now always included in the installer
svn revision is used for assemblies on compiling
svn revision is used for installer compiling

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/Build Deploy Debug.bat
    trunk/plugins/IR Server Suite/Build Deploy Release.bat
    trunk/plugins/IR Server Suite/setup/setup.nsi

Added Paths:
-----------
    trunk/plugins/IR Server Suite/Documentation/IR Server Suite.chm

Property Changed:
----------------
    trunk/plugins/IR Server Suite/Documentation/

Modified: trunk/plugins/IR Server Suite/Build Deploy Debug.bat
===================================================================

--- trunk/plugins/IR Server Suite/Build Deploy Debug.bat	2009-02-03 14:37:40 UTC (rev 2597)
+++ trunk/plugins/IR Server Suite/Build Deploy Debug.bat	2009-02-03 17:39:03 UTC (rev 2598)
@@ -1,41 +1,3 @@
 @ECHO OFF
 
-
-REM set build type to debug
-set BUILD_TYPE=Debug
-
-
-REM set logfile where the infos are written to, and clear that file
-set LOG=build_%BUILD_TYPE%.log
-echo. > %LOG%
-
-
-REM Select program path based on current machine environment
-set progpath=%ProgramFiles%
-if not "%ProgramFiles(x86)%".=="". set progpath=%ProgramFiles(x86)%
-
-
-echo.
-echo -= IR Server Suite =-
-echo -= build mode: %BUILD_TYPE% =-
-echo.
-
-echo.
-echo Writing SVN revision assemblies...
-setup\DeployVersionSVN.exe /svn="%CD%"  >> %LOG%
-
-echo.
-echo Building IR Server Suite...
-"%progpath%\Microsoft Visual Studio 8\Common7\IDE\devenv.com" /rebuild %BUILD_TYPE% "IR Server Suite.sln" >> %LOG%
-
-echo.
-echo Reverting assemblies...
-setup\DeployVersionSVN.exe /svn="%CD%" /revert >> %LOG%
-
-echo.
-echo Building Installer...
-setup\DeployVersionSVN.exe /svn="%CD%" /GetVersion >> %LOG%
-IF NOT EXIST version.txt EXIT
-SET /p version=<version.txt
-DEL version.txt
-"%progpath%\NSIS\makensis.exe" /DVER_BUILD=%version% setup\setup.nsi >> %LOG%
\ No newline at end of file
+call "Build Deploy Release.bat" Debug
\ No newline at end of file

Modified: trunk/plugins/IR Server Suite/Build Deploy Release.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build Deploy Release.bat	2009-02-03 14:37:40 UTC (rev 2597)
+++ trunk/plugins/IR Server Suite/Build Deploy Release.bat	2009-02-03 17:39:03 UTC (rev 2598)
@@ -5,35 +5,48 @@
 if not %1!==Debug! goto RELEASE
 :DEBUG
 set BUILD_TYPE=Debug
-goto END_BUILD_TYPE
+goto START
 :RELEASE
 set BUILD_TYPE=Release
-:END_BUILD_TYPE
+goto START
 
 
+:START
+REM Select program path based on current machine environment
+set progpath=%ProgramFiles%
+if not "%ProgramFiles(x86)%".=="". set progpath=%ProgramFiles(x86)%
+
+
 REM set logfile where the infos are written to, and clear that file
 set LOG=build_%BUILD_TYPE%.log
 echo. > %LOG%
 
 
-REM Select program path based on current machine environment
-set progpath=%ProgramFiles%
-if not "%ProgramFiles(x86)%".=="". set progpath=%ProgramFiles(x86)%
-
-
 echo.
 echo -= IR Server Suite =-
 echo -= build mode: %BUILD_TYPE% =-
 echo.
 
 echo.
+echo Writing SVN revision assemblies...
+setup\DeployVersionSVN.exe /svn="%CD%"  >> %LOG%
+
+echo.
 echo Building IR Server Suite...
 "%progpath%\Microsoft Visual Studio 8\Common7\IDE\devenv.com" /rebuild %BUILD_TYPE% "IR Server Suite.sln" >> %LOG%
 
 echo.
-echo Building Help file...
-"%ProgramFiles%\HTML Help Workshop\hhc.exe" "Documentation\IR Server Suite.hhp" >> %LOG%
+echo Reverting assemblies...
+setup\DeployVersionSVN.exe /svn="%CD%" /revert >> %LOG%
 
 echo.
+echo Reading the svn revision...
+echo $WCREV$>template.txt
+"%ProgramFiles%\TortoiseSVN\bin\SubWCRev.exe" ".." template.txt version.txt >> %LOG%
+SET /p version=<version.txt >> %LOG%
+DEL template.txt >> %LOG%
+DEL version.txt >> %LOG%
+
+echo.
 echo Building Installer...
-"%progpath%\NSIS\makensis.exe" setup\setup.nsi >> %LOG%
\ No newline at end of file
+"%progpath%\NSIS\makensis.exe" /DBUILD_TYPE=%BUILD_TYPE% /DVER_BUILD=%version% setup\setup.nsi >> %LOG%


Property changes on: trunk/plugins/IR Server Suite/Documentation
___________________________________________________________________
Deleted: svn:ignore
   - IR Server Suite.chm


Added: trunk/plugins/IR Server Suite/Documentation/IR Server Suite.chm
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/IR Server Suite/Documentation/IR Server Suite.chm
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi	2009-02-03 14:37:40 UTC (rev 2597)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi	2009-02-03 17:39:03 UTC (rev 2598)
@@ -280,15 +280,13 @@
   WriteRegStr HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir" "$DIR_MEDIAPORTAL"
   WriteRegStr HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir" "$DIR_TVSERVER"
 
-  ; Write documentation
-!if ${VER_BUILD} != 0
-  DetailPrint "Warning: Documentation is not included in debug builds"
-!else
+
+  ; Create app data directories
   SetOutPath "$DIR_INSTALL"
   SetOverwrite ifnewer
   File "..\Documentation\${PRODUCT_NAME}.chm"
-!endif
 
+
   ; Create app data directories
   CreateDirectory "$APPDATA\${PRODUCT_NAME}"
   CreateDirectory "$APPDATA\${PRODUCT_NAME}\Logs"
@@ -694,11 +692,7 @@
 
 ;======================================
 
-!if ${VER_BUILD} != 0
 ${MementoSection} "Tray Launcher" SectionTrayLauncher
-!else
-${MementoUnselectedSection} "Tray Launcher" SectionTrayLauncher
-!endif
 
   DetailPrint "Installing Tray Launcher ..."
 
@@ -811,11 +805,7 @@
 
 ;======================================
 
-!if ${VER_BUILD} != 0
 ${MementoSection} "IR File Tool" SectionIRFileTool
-!else
-${MementoUnselectedSection} "IR File Tool" SectionIRFileTool
-!endif
 
   DetailPrint "Installing IR File Tool ..."
 
@@ -847,11 +837,7 @@
 
 ;======================================
 
-!if ${VER_BUILD} != 0
 ${MementoSection} "Keyboard Relay" SectionKeyboardInputRelay
-!else
-${MementoUnselectedSection} "Keyboard Relay" SectionKeyboardInputRelay
-!endif
 
   DetailPrint "Installing Keyboard Input Relay ..."
 
@@ -886,11 +872,7 @@
 
 ;======================================
 
-!if ${VER_BUILD} != 0
 ${MementoSection} "Dbox Tuner" SectionDboxTuner
-!else
-${MementoUnselectedSection} "Dbox Tuner" SectionDboxTuner
-!endif
 
   DetailPrint "Installing Dbox Tuner ..."
 
@@ -916,11 +898,7 @@
 
 ;======================================
 
-!if ${VER_BUILD} != 0
 ${MementoSection} "HCW PVR Tuner" SectionHcwPvrTuner
-!else
-${MementoUnselectedSection} "HCW PVR Tuner" SectionHcwPvrTuner
-!endif
 
   DetailPrint "Installing HCW PVR Tuner ..."
 
@@ -943,11 +921,7 @@
 
 ;======================================
 
-!if ${VER_BUILD} != 0
 ${MementoSection} "Debug Client" SectionDebugClient
-!else
-${MementoUnselectedSection} "Debug Client" SectionDebugClient
-!endif
 
   DetailPrint "Installing Debug Client ..."
 
@@ -1024,13 +998,6 @@
   Push $0
   Call DumpLog
 
-  ; Finish
-!if ${VER_BUILD} != 0
-  SetAutoClose false
-!else
-  SetAutoClose true
-!endif
-
 SectionEnd
 
 ;======================================
@@ -1072,12 +1039,6 @@
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
   DeleteRegKey HKLM "Software\${PRODUCT_NAME}"
 
-!if ${VER_BUILD} != 0
-  SetAutoClose false
-!else
-  SetAutoClose true
-!endif
-
 SectionEnd
 
 ;======================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


