Changeset 13428


Ignore:
Timestamp:
12/02/15 12:32:35 (4 years ago)
Author:
abeham
Message:

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

Location:
trunk/sources
Files:
4 deleted
3 edited

Legend:

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

    r11623 r13428  
    224224if exist "%25ProjectDir%25CustomPostBuild.cmd" call CustomPostBuild.cmd</PostBuildEvent>
    225225    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    226 export Outdir=$(Outdir)
     226export OutDir=$(OutDir)
    227227export ProjectDir=$(ProjectDir)
    228228export SolutionDir=$(SolutionDir)
     229export TargetDir=$(TargetDir)
    229230
    230231$SolutionDir/MergeConfigs.sh
    231232</PostBuildEvent>
    232233  </PropertyGroup>
     234  <PropertyGroup>
     235    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     236set ProjectDir=$(ProjectDir)
     237set SolutionDir=$(SolutionDir)
     238set OutDir=$(OutDir)
     239set TargetDir=$(TargetDir)
     240set Platform=$(PlatformName)
     241set Configuration=$(ConfigurationName)
     242
     243call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
     244  </PropertyGroup>
    233245</Project>
  • trunk/sources/MergeConfigs.cmd

    r7060 r13428  
    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
  • trunk/sources/MergeConfigs.sh

    r8600 r13428  
    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.