Changeset e92e09a in tol for windows

Timestamp:

Dec 15, 2008, 3:35:25 PM (18 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

f81d033

Parents:

fe3bff2

Message:

• new directory xxx/win-VC9 with configuration files to compile with VC 9.0

• uptol_new.bat to simplify environment check: just Visual Studio console is needed.

• *_d.dll debugger versions are skipped in .nsi

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@298 be4846ae-f051-483a-831f-b64e7d08527f

Location:

windows

Files:

• NSIS/Tolbase.nsi (modified) (9 diffs)
• NSIS/Tolbase.nsi.generate.tol (modified) (2 diffs)
• build_tools/_uptol_new.bat (added)
• build_tools/uptol.bat (modified) (1 diff)
• build_tools/uptol_new.bat (added)

windows/NSIS/Tolbase.nsi

@@ -3 +3 @@
 ; HM NIS Edit Wizard helper defines
 !define APP_VERSION "v1.1.7"
-!define APP_RELEASE "v1.1.7 b.0.11.alpha"
+!define APP_RELEASE "v1.1.7 b.0.12.alpha"
 !define APP_NAME "tolbase"
 !define APP_NAMEV "tolbase-${APP_VERSION}"
@@ -98 +98 @@
   File "..\ActiveTOL\bin\tol.exe"
   File "..\ActiveTOL\bin\tolbase.exe"
+  File "..\ActiveTOL\bin\tolbase.sln"
+  File "..\ActiveTOL\bin\tolbase.suo"
   File "..\ActiveTOL\bin\tolmysql0.dll"
   File "..\ActiveTOL\bin\tolodbc0.dll"
   File "..\ActiveTOL\bin\tolpgsql0.dll"
   File "..\ActiveTOL\bin\tolsh.exe"
+  File "..\ActiveTOL\bin\tolsh.sln"
+  File "..\ActiveTOL\bin\tolsh.suo"
   File "..\ActiveTOL\bin\vbtol.dll"
   File "..\ActiveTOL\bin\winserv.exe"
@@ -227 +231 @@
   SetOutPath "$INSTDIR\bin\stdlib\math\stat\descriptive_stats"
   File "..\ActiveTOL\bin\stdlib\math\stat\descriptive_stats\_init_descriptive_stats.tol"
+  SetOutPath "$INSTDIR\bin\stdlib\math\stat\diagnostics"
+  File "..\ActiveTOL\bin\stdlib\math\stat\diagnostics\_binaryModel.tol"
+  File "..\ActiveTOL\bin\stdlib\math\stat\diagnostics\_init_diagnostics.tol"
   SetOutPath "$INSTDIR\bin\stdlib\math\stat\hypothesis_tests"
   File "..\ActiveTOL\bin\stdlib\math\stat\hypothesis_tests\_confidence_intervals.tol"
@@ -255 +262 @@
   File "..\ActiveTOL\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\_bsr.tol"
   File "..\ActiveTOL\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\_import.tol"
+  File "..\ActiveTOL\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\_oneNode.tol"
   SetOutPath "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\dynhlm"
   File "..\ActiveTOL\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\dynhlm\_build.node.lat.tol"
@@ -277 +285 @@
   File "..\ActiveTOL\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_deltaTransfer.tol"
   File "..\ActiveTOL\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_estim.tol"
-  File "..\ActiveTOL\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_estimOneNode.tol"
   File "..\ActiveTOL\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_gibbs.tol"
   File "..\ActiveTOL\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_inputMissingBlock.tol"
@@ -1878 +1885 @@
   Delete "$INSTDIR\bin\stdlib\math\stat\descriptive_stats\_init_descriptive_stats.tol"
   RmDir  "$INSTDIR\bin\stdlib\math\stat\descriptive_stats"
+  Delete "$INSTDIR\bin\stdlib\math\stat\diagnostics\_binaryModel.tol"
+  Delete "$INSTDIR\bin\stdlib\math\stat\diagnostics\_init_diagnostics.tol"
+  RmDir  "$INSTDIR\bin\stdlib\math\stat\diagnostics"
   Delete "$INSTDIR\bin\stdlib\math\stat\hypothesis_tests\_confidence_intervals.tol"
   Delete "$INSTDIR\bin\stdlib\math\stat\hypothesis_tests\_init_hypothesis_tests.tol"
@@ -1912 +1922 @@
   Delete "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_deltaTransfer.tol"
   Delete "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_estim.tol"
-  Delete "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_estimOneNode.tol"
   Delete "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_gibbs.tol"
   Delete "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\gibbs\_inputMissingBlock.tol"
@@ -1924 +1933 @@
   Delete "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\_bsr.tol"
   Delete "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\_import.tol"
+  Delete "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr\_oneNode.tol"
   RmDir  "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\bsr"
   Delete "$INSTDIR\bin\stdlib\math\stat\models\bayesian\bysMcmc\test_01\def.tol"
@@ -2030 +2040 @@
   Delete "$INSTDIR\bin\tol.exe"
   Delete "$INSTDIR\bin\tolbase.exe"
+  Delete "$INSTDIR\bin\tolbase.sln"
+  Delete "$INSTDIR\bin\tolbase.suo"
   Delete "$INSTDIR\bin\tolmysql0.dll"
   Delete "$INSTDIR\bin\tolodbc0.dll"
   Delete "$INSTDIR\bin\tolpgsql0.dll"
   Delete "$INSTDIR\bin\tolsh.exe"
+  Delete "$INSTDIR\bin\tolsh.sln"
+  Delete "$INSTDIR\bin\tolsh.suo"
   Delete "$INSTDIR\bin\vbtol.dll"
   Delete "$INSTDIR\bin\winserv.exe"

windows/NSIS/Tolbase.nsi.generate.tol

@@ -11 +11 @@
   Text txt = If(isFile, 
   {
-    "  File \""+nameWin+"\"\n"
+    If(TextEndAt(nameWin, "_d.dll"), "", "  File \""+nameWin+"\"\n")
   },
   {
@@ -27 +27 @@
   Text aux = If(isFile, 
   {
-    "  Delete \""+nameWin+"\"\n"
+    If(TextEndAt(nameWin, "_d.dll"), "", "  Delete \""+nameWin+"\"\n")
   },
   {

windows/build_tools/uptol.bat

@@ -6 +6 @@
 
 SetLocal enableextensions enabledelayedexpansion
-
-GOTO DO
 
 ECHO Actualizando el codigo desde el repositorio