Changeset 1403

Timestamp:

03/24/09 12:05:19 (16 years ago)

Author:

gkronber

Message:

Added conditional deployment of external SQLite assembly in CopyAssemblies.cmd script. #460

Location:

trunk/sources/HeuristicLab

Files:

• CopyAssemblies.cmd (modified) (2 diffs)
• HeuristicLab.csproj (modified) (1 diff)

trunk/sources/HeuristicLab/CopyAssemblies.cmd

@@ -54 +54 @@
 copy "%SolutionDir%\HeuristicLab.SimOpt\%Outdir%\HeuristicLab.SimOpt-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.SQLite\%Outdir%\HeuristicLab.SQLite-3.2.dll" .\plugins
-copy "%SolutionDir%\HeuristicLab.SQLite\System.Data.SQLite.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.SQLite\SQLite License.txt" .\plugins
 copy "%SolutionDir%\HeuristicLab.SQLite\SQLite.NET.chm" .\plugins
@@ -81 +80 @@
 copy "%SolutionDir%\HeuristicLab.DataAccess.ADOHelper\%Outdir%\HeuristicLab.DataAccess.ADOHelper-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Hive.Server.DataAccess\%Outdir%\HeuristicLab.Hive.Server.DataAccess-3.2.dll" .\plugins
+
+echo "Platform: %Platform%, architecture: %PROCESSOR_ARCHITECTURE%"
+if "%Platform%" == "x86" (   
+  xcopy "%SolutionDir%\HeuristicLab.SQLite\System.Data.SQLite.dll" .\plugins
+) else if "%Platform%" == "x64" ( 
+  xcopy "%SolutionDir%\HeuristicLab.SQLite\System.Data.SQLite.x64.dll" .\plugins\System.Data.SQLite.dll
+) else if "%Platform%" == "AnyCPU" (
+  if "%PROCESSOR_ARCHITECTURE%" == "x64" (
+    xcopy "%SolutionDir%\HeuristicLab.SQLite\System.Data.SQLite.x64.dll" .\plugins\System.Data.SQLite.dll
+  ) else if "%PROCESSOR_ARCHITECTURE%" == "x86" (
+    xcopy "%SolutionDir%\HeuristicLab.SQLite\System.Data.SQLite.dll" .\plugins
+  ) else (
+    echo "ERROR: unknown architecture: "%PROCESSOR_ARCHITECTURE%"
+  ) 
+) else (
+  echo "ERROR: unknown platform: %Platform%"
+)
+

trunk/sources/HeuristicLab/HeuristicLab.csproj

@@ -146 +146 @@
 set SolutionDir=$(SolutionDir)
 set Outdir=$(Outdir)
+set Platform=$(PlatformName)
 
 call MergeConfigs.cmd