Changeset 14207


Ignore:
Timestamp:
07/23/16 23:05:15 (8 months ago)
Author:
swagner
Message:

#2526: Corrected post build events and config merging

Location:
trunk/sources
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj

    r13509 r14207  
    170170    <Compile Include="StatusCommons.cs" />
    171171    <Compile Include="WcfService.cs" />
    172     <None Include="app.config" />
     172    <None Include="app.config">
     173      <SubType>Designer</SubType>
     174    </None>
    173175    <None Include="Plugin.cs.frame" />
    174176    <Compile Include="Plugin.cs" />
     
    189191set SolutionDir=$(SolutionDir)
    190192set Outdir=$(Outdir)
     193set TargetDir=$(TargetDir)
    191194set Platform=$(PlatformName)
    192195set Configuration=$(ConfigurationName)
    193 set TargetDir=$(ProjectDir)
    194196
    195197call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
  • trunk/sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj

    r13430 r14207  
    225225$SolutionDir/MergeConfigs.sh
    226226</PostBuildEvent>
    227   </PropertyGroup>
     227  </PropertyGroup>
     228  <PropertyGroup>
     229    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     230set ProjectDir=$(ProjectDir)
     231set SolutionDir=$(SolutionDir)
     232set OutDir=$(OutDir)
     233set TargetDir=$(TargetDir)
     234set Platform=$(PlatformName)
     235set Configuration=$(ConfigurationName)
     236
     237call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
     238  </PropertyGroup>
    228239</Project>
  • trunk/sources/MergeConfigs.cmd

    r13428 r14207  
    77
    88echo Recreating HeuristicLab 3.3.exe.config...
    9 copy /Y "%TargetDir%app.config" "%TargetDir%HeuristicLab 3.3.exe.config"
     9copy /Y "%SolutionDir%\HeuristicLab\3.3\app.config" "%TargetDir%HeuristicLab 3.3.exe.config"
    1010
    1111echo Merging...
  • trunk/sources/MergeConfigs.sh

    r13428 r14207  
    44
    55echo Recreating HeuristicLab 3.3.exe.config...
    6 cp $TargetDir/app.config "$TargetDir/HeuristicLab 3.3.exe.config"
     6cp $SolutionDir/HeuristicLab/3.3/app.config "$TargetDir/HeuristicLab 3.3.exe.config"
    77
    88echo Merging...
Note: See TracChangeset for help on using the changeset viewer.