Changeset 12007 for stable


Ignore:
Timestamp:
02/13/15 17:09:22 (6 years ago)
Author:
ascheibe
Message:

#2290 merged r11723, r11724, r11829, r11830, r11831, r11833, r11992 into stable

Location:
stable
Files:
1 deleted
12 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab 3.3.sln

    r12005 r12007  
    19651965    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    19661966    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1967     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|x64.ActiveCfg = Debug|Any CPU
    1968     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|x86.ActiveCfg = Debug|Any CPU
     1967    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|x64.ActiveCfg = Debug|x64
     1968    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|x64.Build.0 = Debug|x64
     1969    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|x86.ActiveCfg = Debug|x86
     1970    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|x86.Build.0 = Debug|x86
    19691971    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
    19701972    {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Release|Any CPU.Build.0 = Release|Any CPU
  • stable/HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj

    r11937 r12007  
    234234  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    235235  <PropertyGroup>
    236     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    237 set ProjectDir=$(ProjectDir)
    238 set SolutionDir=$(SolutionDir)
    239 set Outdir=$(Outdir)
     236    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     237      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     238      set ProjectDir=$(ProjectDir)
     239      set SolutionDir=$(SolutionDir)
     240      set Outdir=$(Outdir)
    240241
    241 call PreBuildEvent.cmd
    242 </PreBuildEvent>
     242      call PreBuildEvent.cmd
     243    </PreBuildEvent>
     244    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     245      export ProjectDir=$(ProjectDir)
     246      export SolutionDir=$(SolutionDir)
     247
     248      $SolutionDir/PreBuildEvent.sh
     249    </PreBuildEvent>
    243250  </PropertyGroup>
    244251  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj

    r11920 r12007  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>..\..\bin\</OutputPath>
     20    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    2323    <WarningLevel>4</WarningLevel>
    24     <UseVSHostingProcess>false</UseVSHostingProcess>
     24    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2525    <Prefer32Bit>false</Prefer32Bit>
    2626  </PropertyGroup>
     
    2828    <DebugType>pdbonly</DebugType>
    2929    <Optimize>true</Optimize>
    30     <OutputPath>..\..\bin\</OutputPath>
     30    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3131    <DefineConstants>TRACE</DefineConstants>
    3232    <ErrorReport>prompt</ErrorReport>
    3333    <WarningLevel>4</WarningLevel>
     34    <DocumentationFile>
     35    </DocumentationFile>
     36    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     37    <Prefer32Bit>false</Prefer32Bit>
     38  </PropertyGroup>
     39  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     40    <DebugSymbols>true</DebugSymbols>
     41    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     42    <DefineConstants>DEBUG;TRACE</DefineConstants>
     43    <DebugType>full</DebugType>
     44    <PlatformTarget>x64</PlatformTarget>
     45    <ErrorReport>prompt</ErrorReport>
     46    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     47    <Prefer32Bit>false</Prefer32Bit>
     48  </PropertyGroup>
     49  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     50    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     51    <DefineConstants>TRACE</DefineConstants>
     52    <DocumentationFile>
     53    </DocumentationFile>
     54    <Optimize>true</Optimize>
     55    <DebugType>pdbonly</DebugType>
     56    <PlatformTarget>x64</PlatformTarget>
     57    <ErrorReport>prompt</ErrorReport>
     58    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     59    <Prefer32Bit>false</Prefer32Bit>
     60  </PropertyGroup>
     61  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     62    <DebugSymbols>true</DebugSymbols>
     63    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     64    <DefineConstants>DEBUG;TRACE</DefineConstants>
     65    <DebugType>full</DebugType>
     66    <PlatformTarget>x86</PlatformTarget>
     67    <ErrorReport>prompt</ErrorReport>
     68    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     69    <Prefer32Bit>false</Prefer32Bit>
     70  </PropertyGroup>
     71  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     72    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <DefineConstants>TRACE</DefineConstants>
     74    <DocumentationFile>
     75    </DocumentationFile>
     76    <Optimize>true</Optimize>
     77    <DebugType>pdbonly</DebugType>
     78    <PlatformTarget>x86</PlatformTarget>
     79    <ErrorReport>prompt</ErrorReport>
     80    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3481    <Prefer32Bit>false</Prefer32Bit>
    3582  </PropertyGroup>
  • stable/HeuristicLab.ExtLibs

  • stable/HeuristicLab.ExtLibs/HeuristicLab.AvalonEdit/5.0.1/HeuristicLab.AvalonEdit-5.0.1/HeuristicLab.AvalonEdit-5.0.1.csproj

    r11700 r12007  
    111111  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    112112  <PropertyGroup>
    113     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    114 set ProjectDir=$(ProjectDir)
    115 set SolutionDir=$(SolutionDir)
    116 set Outdir=$(Outdir)
     113    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     114      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     115      set ProjectDir=$(ProjectDir)
     116      set SolutionDir=$(SolutionDir)
     117      set Outdir=$(Outdir)
    117118
    118 call PreBuildEvent.cmd
    119 </PreBuildEvent>
     119      call PreBuildEvent.cmd
     120    </PreBuildEvent>
     121    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     122      export ProjectDir=$(ProjectDir)
     123      export SolutionDir=$(SolutionDir)
     124
     125      $SolutionDir/PreBuildEvent.sh
     126    </PreBuildEvent>
    120127  </PropertyGroup>
    121   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    122        Other similar extension points exist, see Microsoft.Common.targets.
    123   <Target Name="BeforeBuild">
    124   </Target>
    125   <Target Name="AfterBuild">
    126   </Target>
    127   -->
    128128</Project>
  • stable/HeuristicLab.ExtLibs/HeuristicLab.Cecil/0.9.5/HeuristicLab.Cecil-0.9.5/HeuristicLab.Cecil-0.9.5.csproj

    r11700 r12007  
    111111  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    112112  <PropertyGroup>
    113     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     113    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    114114set ProjectDir=$(ProjectDir)
    115115set SolutionDir=$(SolutionDir)
     
    118118call PreBuildEvent.cmd
    119119</PreBuildEvent>
     120    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     121export ProjectDir=$(ProjectDir)
     122export SolutionDir=$(SolutionDir)
     123
     124$SolutionDir/PreBuildEvent.sh
     125</PreBuildEvent>
    120126  </PropertyGroup>
    121   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    122        Other similar extension points exist, see Microsoft.Common.targets.
    123   <Target Name="BeforeBuild">
    124   </Target>
    125   <Target Name="AfterBuild">
    126   </Target>
    127   -->
    128127</Project>
  • stable/HeuristicLab.ExtLibs/HeuristicLab.NRefactory/5.5.0/HeuristicLab.NRefactory-5.5.0/HeuristicLab.NRefactory-5.5.0.csproj

    r11810 r12007  
    123123  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    124124  <PropertyGroup>
    125     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    126 set ProjectDir=$(ProjectDir)
    127 set SolutionDir=$(SolutionDir)
    128 set Outdir=$(Outdir)
     125    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     126      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     127      set ProjectDir=$(ProjectDir)
     128      set SolutionDir=$(SolutionDir)
     129      set Outdir=$(Outdir)
    129130
    130 call PreBuildEvent.cmd
    131 </PreBuildEvent>
     131      call PreBuildEvent.cmd
     132    </PreBuildEvent>
     133    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     134      export ProjectDir=$(ProjectDir)
     135      export SolutionDir=$(SolutionDir)
     136
     137      $SolutionDir/PreBuildEvent.sh
     138    </PreBuildEvent>
    132139  </PropertyGroup>
    133   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    134        Other similar extension points exist, see Microsoft.Common.targets.
    135   <Target Name="BeforeBuild">
    136   </Target>
    137   <Target Name="AfterBuild">
    138   </Target>
    139   -->
    140140</Project>
  • stable/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1/ProtobufCS/src/ProtoGen/ProtoGen-2.4.1.473.csproj

    r11920 r12007  
    189189  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    190190  <PropertyGroup>
    191     <PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)"
    192 copy "$(TargetDir)Google.ProtocolBuffers-2.4.1.473.dll" "$(SolutionDir)"
    193 copy "$(ProjectDir)..\..\lib\protoc.exe" "$(SolutionDir)"</PostBuildEvent>
    194   </PropertyGroup>
     191    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     192    copy "$(TargetPath)" "$(SolutionDir)"
     193    copy "$(TargetDir)Google.ProtocolBuffers-2.4.1.473.dll" "$(SolutionDir)"
     194    copy "$(ProjectDir)..\..\lib\protoc.exe" "$(SolutionDir)"
     195  </PostBuildEvent>
     196    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     197    cp "$(TargetPath)" "$(SolutionDir)"
     198    cp "$(TargetDir)Google.ProtocolBuffers-2.4.1.473.dll" "$(SolutionDir)"
     199    cp "$(ProjectDir)..\..\lib\protoc.exe" "$(SolutionDir)"
     200  </PostBuildEvent>
     201  </PropertyGroup> 
    195202  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    196203       Other similar extension points exist, see Microsoft.Common.targets.
  • stable/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj

    r11920 r12007  
    1212    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    14     <SccProjectName>Svn</SccProjectName>
    15     <SccLocalPath>Svn</SccLocalPath>
    16     <SccAuxPath>Svn</SccAuxPath>
    17     <SccProvider>SubversionScc</SccProvider>
    1814    <TargetFrameworkProfile />
    1915  </PropertyGroup>
  • stable/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj

    r11920 r12007  
    1212    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    14     <SccProjectName>Svn</SccProjectName>
    15     <SccLocalPath>Svn</SccLocalPath>
    16     <SccAuxPath>Svn</SccAuxPath>
    17     <SccProvider>SubversionScc</SccProvider>
    1814    <TargetFrameworkProfile />
    1915  </PropertyGroup>
  • stable/HeuristicLab.Scripting/3.3/Scripts/Templates/ScriptTemplates.resx

    r11787 r12007  
    120120  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
    121121  <data name="CSharpScriptTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
    122     <value>csharpscripttemplate.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
     122    <value>CSharpScriptTemplate.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
    123123  </data>
    124124</root>
Note: See TracChangeset for help on using the changeset viewer.