[Scstudio-commits] SF.net SVN: scstudio:[1428] trunk

[<xr...@us...>]

Revision: 1428
          http://scstudio.svn.sourceforge.net/scstudio/?rev=1428&view=rev
Author:   xrehak
Date:     2012-06-25 21:58:07 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
redistribute in nsi and new make_build.bat

Modified Paths:
--------------
    trunk/src/view/visio/scstudio.nsi

Added Paths:
-----------
    trunk/make_build.bat

Removed Paths:
-------------
    trunk/third-party-sw/redistribute/lpsolve55.dll

Added: trunk/make_build.bat
===================================================================
--- trunk/make_build.bat	                        (rev 0)
+++ trunk/make_build.bat	2012-06-25 21:58:07 UTC (rev 1428)
@@ -0,0 +1,68 @@
+rem $Id$
+
+@echo off
+set VERSION=actual-local
+
+REM set the following to build or to rebuild
+set ACTION=rebuild
+rem set ACTION=build
+
+REM set the following to Release or to Debug
+set TARGET=Release
+rem set TARGET=Debug
+
+echo %ACTION% in %TARGET% mode into scstudio-setup-%VERSION%.exe
+echo.
+
+pushd %~dp0
+
+REM Even explicitelly specified address is without qoutes here.
+set PROJECT_TRUNK_DIR=%CD%
+REM Contrary to the previous one, others are in qoutes!
+set DEVENV_COMMAND="C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com"
+set CMAKE_EXE="C:\Program Files (x86)\CMake 2.8\bin\cmake.exe"
+set CMAKE_EXE_GUI="C:\Program Files (x86)\CMake 2.8\bin\cmake-gui.exe"
+set NSIS_EXE="C:\Program Files (x86)\NSIS\makensis.exe"
+set SIGN_TOOL_EXE="C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\signtool.exe"
+
+echo Cmake...
+IF "%ACTION%"=="rebuild" (
+  del /f /q "%PROJECT_TRUNK_DIR%\CMakeCache.txt"
+  %CMAKE_EXE_GUI% "%PROJECT_TRUNK_DIR%"
+) ELSE (
+  %CMAKE_EXE% "%PROJECT_TRUNK_DIR%"
+)
+
+
+echo.
+echo Compiling algorithms ...
+%DEVENV_COMMAND% "%PROJECT_TRUNK_DIR%\scstudio.sln" /%ACTION% %TARGET% | findstr /v "CMake"| findstr "up-to-date error succeeded"
+IF %errorlevel% NEQ 0 EXIT
+
+echo.
+echo Compiling visio addon ...
+%DEVENV_COMMAND% "%PROJECT_TRUNK_DIR%\src\view\visio\scstudio.sln" /%ACTION% %TARGET% | findstr /v "CMake"| findstr "up-to-date error succeeded"
+IF %errorlevel% NEQ 0 EXIT
+
+echo.
+echo Compiling visio setup-nsis ...
+%DEVENV_COMMAND% "%PROJECT_TRUNK_DIR%\src\view\visio\scstudio.sln" /project setup-nsis /%ACTION% %TARGET% | findstr /v "CMake"| findstr "up-to-date error succeeded"
+IF %errorlevel% NEQ 0 EXIT
+
+echo.
+echo Compiling installation package ...
+%NSIS_EXE% /V1 /DVERSION=%VERSION% /DBUILD_TYPE=%TARGET% "%PROJECT_TRUNK_DIR%\src\view\visio\scstudio.nsi"
+IF %errorlevel% NEQ 0 EXIT
+%SIGN_TOOL_EXE% sign /a "%PROJECT_TRUNK_DIR%\src\view\visio\scstudio-setup-%VERSION%.exe"
+IF %errorlevel% NEQ 0 EXIT
+
+move "%PROJECT_TRUNK_DIR%\src\view\visio\scstudio-setup-%VERSION%.exe" "%PROJECT_TRUNK_DIR%"
+echo "========== Done =========="
+echo.
+
+choice /N /M "Would you like to install it? y/[n] "
+If %Errorlevel% EQU 1 (
+  "%PROJECT_TRUNK_DIR%\scstudio-setup-%VERSION%.exe"
+)
+
+


Property changes on: trunk/make_build.bat
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision URL Header
Added: svn:eol-style
   + native

Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi	2012-06-25 21:37:05 UTC (rev 1427)
+++ trunk/src/view/visio/scstudio.nsi	2012-06-25 21:58:07 UTC (rev 1428)
@@ -158,14 +158,15 @@
 
   SetOutPath $INSTDIR\bin
   DetailPrint "Installing Microsoft libraries"
-  File "redistribute\Microsoft.VC90.ATL.manifest"
-  File "redistribute\atl90.dll"
-  File "redistribute\Microsoft.VC90.CRT.manifest"
-  File "redistribute\msvcm90.dll"
-  File "redistribute\msvcp90.dll"
-  File "redistribute\msvcr90.dll"
-  File "redistribute\lpsolve55.dll"
-  File "redistribute\capicom.dll"
+  File "..\..\..\third-party-sw\redistribute\Microsoft.VC90.ATL.manifest"
+  File "..\..\..\third-party-sw\redistribute\Microsoft.VC90.ATL.manifest"
+  File "..\..\..\third-party-sw\redistribute\atl90.dll"
+  File "..\..\..\third-party-sw\redistribute\Microsoft.VC90.CRT.manifest"
+  File "..\..\..\third-party-sw\redistribute\msvcm90.dll"
+  File "..\..\..\third-party-sw\redistribute\msvcp90.dll"
+  File "..\..\..\third-party-sw\redistribute\msvcr90.dll"
+  File "..\..\..\third-party-sw\lpsolve\lib\lpsolve55.dll"
+  File "..\..\..\third-party-sw\redistribute\capicom.dll"
   ExecWait 'regsvr32.exe /s "$INSTDIR\capicom.dll"'
 
   SetOutPath $TEMP

Deleted: trunk/third-party-sw/redistribute/lpsolve55.dll
===================================================================
(Binary files differ)

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