Changeset 13453

Timestamp:

12/14/15 10:27:02 (9 years ago)

Author:

abeham

Message:

#2539: merged r13428:13430 to stable

Location:

stable

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) (3 diffs)
• MergeConfigs.cmd (modified) (1 diff)
• MergeConfigs.sh (modified) (1 diff)

stable/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -141 +141 @@
       <SubType>Designer</SubType>
     </None>
-    <None Include="CustomPostBuild.cmd" />
-    <None Include="CustomPostBuildTemplate_UpdateLocalInstallation.cmd" />
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
@@ -166 +164 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <Content Include="Files.txt">
-    </Content>
-    <Content Include="Files.x64.txt">
-    </Content>
-    <Content Include="Files.x86.txt">
-    </Content>
     <None Include="HeuristicLab 3.3 License.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -214 +206 @@
 $SolutionDir/PreBuildEvent.sh
 </PreBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
-set ProjectDir=$(ProjectDir)
-set SolutionDir=$(SolutionDir)
-set Outdir=$(Outdir)
-set Platform=$(PlatformName)
-set Configuration=$(ConfigurationName)
-
-call "$(SolutionDir)MergeConfigs.cmd"
-if exist "%25ProjectDir%25CustomPostBuild.cmd" call CustomPostBuild.cmd</PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+      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>
     <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> 
 </Project>

stable/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"
 )
 

stable/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