Changeset 13453


Ignore:
Timestamp:
12/14/15 10:27:02 (5 years ago)
Author:
abeham
Message:

#2539: merged r13428:13430 to stable

Location:
stable
Files:
4 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • stable/HeuristicLab/3.3/HeuristicLab-3.3.csproj

    r11920 r13453  
    141141      <SubType>Designer</SubType>
    142142    </None>
    143     <None Include="CustomPostBuild.cmd" />
    144     <None Include="CustomPostBuildTemplate_UpdateLocalInstallation.cmd" />
    145143    <None Include="HeuristicLab.snk" />
    146144    <None Include="Properties\AssemblyInfo.cs.frame" />
     
    166164      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    167165    </None>
    168     <Content Include="Files.txt">
    169     </Content>
    170     <Content Include="Files.x64.txt">
    171     </Content>
    172     <Content Include="Files.x86.txt">
    173     </Content>
    174166    <None Include="HeuristicLab 3.3 License.txt">
    175167      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     
    214206$SolutionDir/PreBuildEvent.sh
    215207</PreBuildEvent>
    216     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    217 set ProjectDir=$(ProjectDir)
    218 set SolutionDir=$(SolutionDir)
    219 set Outdir=$(Outdir)
    220 set Platform=$(PlatformName)
    221 set Configuration=$(ConfigurationName)
    222 
    223 call "$(SolutionDir)MergeConfigs.cmd"
    224 if exist "%25ProjectDir%25CustomPostBuild.cmd" call CustomPostBuild.cmd</PostBuildEvent>
     208    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     209      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     210      set ProjectDir=$(ProjectDir)
     211      set SolutionDir=$(SolutionDir)
     212      set OutDir=$(OutDir)
     213      set TargetDir=$(TargetDir)
     214      set Platform=$(PlatformName)
     215      set Configuration=$(ConfigurationName)
     216
     217      call "$(SolutionDir)MergeConfigs.cmd"
     218    </PostBuildEvent>
    225219    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    226 export Outdir=$(Outdir)
     220export OutDir=$(OutDir)
    227221export ProjectDir=$(ProjectDir)
    228222export SolutionDir=$(SolutionDir)
     223export TargetDir=$(TargetDir)
    229224
    230225$SolutionDir/MergeConfigs.sh
    231226</PostBuildEvent>
    232   </PropertyGroup>
     227  </PropertyGroup> 
    233228</Project>
  • stable/MergeConfigs.cmd

    r7060 r13453  
    11@echo off
    22
    3 IF "%Outdir%"=="" (
    4   SET Outdir=bin\
     3IF "%TargetDir%"=="" (
     4  SET TargetDir=.\bin\
    55  SET INTERACTIVE=1
    66)
    77
    88echo Recreating HeuristicLab 3.3.exe.config...
    9 copy /Y "%Outdir%app.config" "%Outdir%HeuristicLab 3.3.exe.config"
     9copy /Y "%TargetDir%app.config" "%TargetDir%HeuristicLab 3.3.exe.config"
    1010
    1111echo Merging...
    12 FOR /F "tokens=*" %%A IN ('dir /B "%Outdir%*.dll.config"') DO (
    13   ConfigMerger "%Outdir%%%A" "%Outdir%HeuristicLab 3.3.exe.config"
     12FOR /F "tokens=*" %%A IN ('dir /B "%TargetDir%*.dll.config"') DO (
     13  "%SolutionDir%ConfigMerger.exe" "%TargetDir%%%A" "%TargetDir%HeuristicLab 3.3.exe.config"
    1414)
    1515
  • stable/MergeConfigs.sh

    r8600 r13453  
    1 if [ "${Outdir}" == "" ]; then
    2   Outdir=bin
     1if [ "${TargetDir}" == "" ]; then
     2  TargetDir=bin
    33fi
    44
    55echo Recreating HeuristicLab 3.3.exe.config...
    6 cp $Outdir/app.config "$Outdir/HeuristicLab 3.3.exe.config"
     6cp $TargetDir/app.config "$TargetDir/HeuristicLab 3.3.exe.config"
    77
    88echo Merging...
    9 for f in $(ls $Outdir/*.dll.config); do
    10     mono $SolutionDir/ConfigMerger.exe $f "$Outdir/HeuristicLab 3.3.exe.config"
     9for f in $(ls $TargetDir/*.dll.config); do
     10    mono $SolutionDir/ConfigMerger.exe $f "$TargetDir/HeuristicLab 3.3.exe.config"
    1111done
Note: See TracChangeset for help on using the changeset viewer.