Changeset 13428

Timestamp:

12/02/15 12:32:35 (9 years ago)

Author:

abeham

Message:

#2539: fixed MergeConfigs.cmd and .sh files, removed obsolete files

Location:

trunk/sources

Files:

• HeuristicLab/3.3/CustomPostBuildTemplate_UpdateLocalInstallation.cmd (deleted)
• HeuristicLab/3.3/Files.txt (deleted)
• HeuristicLab/3.3/Files.x64.txt (deleted)
• HeuristicLab/3.3/Files.x86.txt (deleted)
• HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) (1 diff)
• MergeConfigs.cmd (modified) (1 diff)
• MergeConfigs.sh (modified) (1 diff)

trunk/sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -224 +224 @@
 if exist "%25ProjectDir%25CustomPostBuild.cmd" call CustomPostBuild.cmd</PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-export Outdir=$(Outdir)
+export OutDir=$(OutDir)
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)
+export TargetDir=$(TargetDir)
 
 $SolutionDir/MergeConfigs.sh
 </PostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set OutDir=$(OutDir)
+set TargetDir=$(TargetDir)
+set Platform=$(PlatformName)
+set Configuration=$(ConfigurationName)
+
+call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

trunk/sources/MergeConfigs.cmd

@@ -1 +1 @@
 @echo off
 
-IF "%Outdir%"=="" (
-  SET Outdir=bin\
+IF "%TargetDir%"=="" (
+  SET TargetDir=.\bin\
   SET INTERACTIVE=1
 )
 
 echo Recreating HeuristicLab 3.3.exe.config...
-copy /Y "%Outdir%app.config" "%Outdir%HeuristicLab 3.3.exe.config"
+copy /Y "%TargetDir%app.config" "%TargetDir%HeuristicLab 3.3.exe.config"
 
 echo Merging...
-FOR /F "tokens=*" %%A IN ('dir /B "%Outdir%*.dll.config"') DO (
-  ConfigMerger "%Outdir%%%A" "%Outdir%HeuristicLab 3.3.exe.config"
+FOR /F "tokens=*" %%A IN ('dir /B "%TargetDir%*.dll.config"') DO (
+  "%SolutionDir%ConfigMerger.exe" "%TargetDir%%%A" "%TargetDir%HeuristicLab 3.3.exe.config"
 )
 

trunk/sources/MergeConfigs.sh

@@ -1 @@
-if [ "${Outdir}" == "" ]; then
-  Outdir=bin
+if [ "${TargetDir}" == "" ]; then
+  TargetDir=bin
 fi
 
 echo Recreating HeuristicLab 3.3.exe.config...
-cp $Outdir/app.config "$Outdir/HeuristicLab 3.3.exe.config"
+cp $TargetDir/app.config "$TargetDir/HeuristicLab 3.3.exe.config"
 
 echo Merging...
-for f in $(ls $Outdir/*.dll.config); do 
-    mono $SolutionDir/ConfigMerger.exe $f "$Outdir/HeuristicLab 3.3.exe.config"
+for f in $(ls $TargetDir/*.dll.config); do 
+    mono $SolutionDir/ConfigMerger.exe $f "$TargetDir/HeuristicLab 3.3.exe.config"
 done