Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2643


Ignore:
Timestamp:
01/19/10 15:01:53 (15 years ago)
Author:
swagner
Message:

Applied changes resulting from the refactored plugin infrastructure to HeuristicLab 3.3 (#799)

Location:
trunk/sources/HeuristicLab 3.3
Files:
4 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3/CopyAssemblies.cmd

    r2572 r2643  
    1 copy "%SolutionDir%\HeuristicLab.PluginInfrastructure.GUI\ICSharpCode.SharpZipLib License.txt" .\
     1FOR /F "skip=1 tokens=1-2 delims=: usebackq" %%G IN ("%ProjectDir%\Files.txt") DO echo "%%H" && copy "%SolutionDir%\%%G\%Outdir%\%%H" .\
    22
    3 rmdir plugins /s /q
    4 mkdir plugins
    5 mkdir plugins\cache
    6 mkdir plugins\temp
    7 mkdir plugins\backup
    83
    9 copy "%SolutionDir%\HeuristicLab.Charting\3.3\%Outdir%\HeuristicLab.Charting-3.3.dll" .\plugins
    10 copy "%SolutionDir%\HeuristicLab.Charting.Data\3.3\%Outdir%\HeuristicLab.Charting.Data-3.3.dll" .\plugins
    11 copy "%SolutionDir%\HeuristicLab.Collections\3.3\%Outdir%\HeuristicLab.Collections-3.3.dll" .\plugins
    12 copy "%SolutionDir%\HeuristicLab.Common\3.2\%Outdir%\HeuristicLab.Common-3.2.dll" .\plugins
    13 copy "%SolutionDir%\HeuristicLab.Common.Resources\3.2\%Outdir%\HeuristicLab.Common.Resources-3.2.dll" .\plugins
    14 copy "%SolutionDir%\HeuristicLab.Core\3.3\%Outdir%\HeuristicLab.Core-3.3.dll" .\plugins
    15 copy "%SolutionDir%\HeuristicLab.Core.Views\3.3\%Outdir%\HeuristicLab.Core.Views-3.3.dll" .\plugins
    16 copy "%SolutionDir%\HeuristicLab.Data\3.3\%Outdir%\HeuristicLab.Data-3.3.dll" .\plugins
    17 copy "%SolutionDir%\HeuristicLab.Evolutionary\3.3\%Outdir%\HeuristicLab.Evolutionary-3.3.dll" .\plugins
    18 copy "%SolutionDir%\HeuristicLab.Logging\3.3\%Outdir%\HeuristicLab.Logging-3.3.dll" .\plugins
    19 copy "%SolutionDir%\HeuristicLab.MainForm\3.2\%Outdir%\HeuristicLab.MainForm-3.2.dll" .\plugins
    20 copy "%SolutionDir%\HeuristicLab.MainForm.Test\3.2\%Outdir%\HeuristicLab.MainForm.Test-3.2.dll" .\plugins
    21 copy "%SolutionDir%\HeuristicLab.MainForm.WindowsForms\3.2\%Outdir%\HeuristicLab.MainForm.WindowsForms-3.2.dll" .\plugins
    22 copy "%SolutionDir%\WinFormsUI\%Outdir%\WeifenLuo.WinFormsUI.Docking.dll" .\plugins
    23 copy "%SolutionDir%\WinFormsUI\%Outdir%\WeifenLuo.WinFormsUI.Docking License.txt" .\plugins
    24 copy "%SolutionDir%\HeuristicLab.Operators\3.3\%Outdir%\HeuristicLab.Operators-3.3.dll" .\plugins
    25 copy "%SolutionDir%\HeuristicLab.Operators.Programmable\3.3\%Outdir%\HeuristicLab.Operators.Programmable-3.3.dll" .\plugins
    26 copy "%SolutionDir%\HeuristicLab.Optimizer\3.3\%Outdir%\HeuristicLab.Optimizer-3.3.dll" .\plugins
    27 copy "%SolutionDir%\HeuristicLab.Permutation\3.3\%Outdir%\HeuristicLab.Permutation-3.3.dll" .\plugins
    28 copy "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll" .\plugins
    29 copy "%SolutionDir%\HeuristicLab.Persistence.GUI\3.3\%Outdir%\HeuristicLab.Persistence.GUI-3.3.dll" .\plugins
    30 copy "%SolutionDir%\HeuristicLab.Random\3.3\%Outdir%\HeuristicLab.Random-3.3.dll" .\plugins
    31 copy "%SolutionDir%\HeuristicLab.Routing.TSP\3.3\%Outdir%\HeuristicLab.Routing.TSP-3.3.dll" .\plugins
    32 copy "%SolutionDir%\HeuristicLab.Selection\3.3\%Outdir%\HeuristicLab.Selection-3.3.dll" .\plugins
    33 copy "%SolutionDir%\HeuristicLab.Selection.OffspringSelection\3.3\%Outdir%\HeuristicLab.Selection.OffspringSelection-3.3.dll" .\plugins
    34 copy "%SolutionDir%\HeuristicLab.SequentialEngine\3.3\%Outdir%\HeuristicLab.SequentialEngine-3.3.dll" .\plugins
    35 copy "%SolutionDir%\HeuristicLab.SGA\3.3\%Outdir%\HeuristicLab.SGA-3.3.dll" .\plugins
    36 copy "%SolutionDir%\HeuristicLab.TestFunctions\3.3\%Outdir%\HeuristicLab.TestFunctions-3.3.dll" .\plugins
    37 copy "%SolutionDir%\HeuristicLab.ThreadParallelEngine\3.3\%Outdir%\HeuristicLab.ThreadParallelEngine-3.3.dll" .\plugins
    38 copy "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\HeuristicLab.Tracing-3.2.dll" .\plugins
    39 copy "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\log4net.dll" .\plugins
    40 copy "%SolutionDir%\HeuristicLab.Tracing\3.2\log4net licence.txt" .\plugins
    41 copy "%SolutionDir%\HeuristicLab.Tracing\3.2\HeuristicLab.log4net.xml" .\plugins
     4echo "Platform: %Platform%, architecture: %PROCESSOR_ARCHITECTURE%"
     5if "%Platform%" == "x86" (   
     6  FOR /F "skip=1 tokens=* usebackq" %%G IN ("%ProjectDir%\Files.x86.txt") DO echo "%%G" && copy "%SolutionDir%\%%G" .\
     7) else if "%Platform%" == "x64" (
     8  FOR /F "skip=1 tokens=* usebackq" %%G IN ("%ProjectDir%\Files.x64.txt") DO echo "%%G" && copy "%SolutionDir%\%%G" .\
     9) else if "%Platform%" == "AnyCPU" (
     10  if "%PROCESSOR_ARCHITECTURE%" == "x64" (
     11  FOR /F "skip=1 tokens=* usebackq" %%G IN ("%ProjectDir%\Files.x64.txt") DO echo "%%G" && copy "%SolutionDir%\%%G" .\
     12  ) else if "%PROCESSOR_ARCHITECTURE%" == "x86" (
     13  FOR /F "skip=1 tokens=* usebackq" %%G IN ("%ProjectDir%\Files.x86.txt") DO echo "%%G" && copy "%SolutionDir%\%%G" .\
     14  ) else (
     15    echo "ERROR: unknown architecture: "%PROCESSOR_ARCHITECTURE%"
     16  )
     17) else (
     18  echo "ERROR: unknown platform: %Platform%"
     19)
     20
     21echo "CopyAssemblies done"

  • trunk/sources/HeuristicLab 3.3/CustomPostBuildTemplate_UpdateLocalInstallation.cmd

    r2492 r2643  
    1 set target=C:\Program Files\HeuristicLab 3.3
     1set target=C:\Program Files\HeuristicLab 3.0
    22
    3 copy "HeuristicLab.exe" "%target%"
    4 copy "HeuristicLab 3.3.exe" "%target%"
    5 copy "HeuristicLab 3.3.exe.config" "%target%"
    6 copy "HeuristicLab.PluginInfrastructure.dll" "%target%"
    7 copy "HeuristicLab.PluginInfrastructure.GUI.dll" "%target%"
    8 copy "ICSharpCode.SharpZipLib.dll" "%target%"
    9 copy "ICSharpCode.SharpZipLib License.txt" "%target%"
    10 rmdir /s /q "%target%\plugins"
    11 xcopy "plugins" "%target%\plugins" /e /i
     3copy HeuristicLab.exe "%target%"
     4copy HeuristicLab.Console.exe "%target%"
     5copy HeuristicLab.exe.config "%target%"
     6copy HeuristicLab.PluginInfrastructure.dll "%target%"
     7
     8FOR /F "skip=1 tokens=1-2 delims=: usebackq" %%G IN ("%ProjectDir%\Files.txt") DO copy "%SolutionDir%\%%G\%Outdir%\%%H" "%target%" >nul
     9
     10
     11echo "Platform: %Platform%, architecture: %PROCESSOR_ARCHITECTURE%"
     12if "%Platform%" == "x86" (   
     13  FOR /F "skip=1 tokens=* usebackq" %%G IN ("%ProjectDir%\Files.x86.txt") DO copy "%SolutionDir%\%%G" "%target%" >nul
     14) else if "%Platform%" == "x64" (
     15  FOR /F "skip=1 tokens=* usebackq" %%G IN ("%ProjectDir%\Files.x64.txt") DO copy "%SolutionDir%\%%G" "%target%" >nul
     16) else if "%Platform%" == "AnyCPU" (
     17  if "%PROCESSOR_ARCHITECTURE%" == "x64" (
     18  FOR /F "skip=1 tokens=* usebackq" %%G IN ("%ProjectDir%\Files.x64.txt") DO copy "%SolutionDir%\%%G" "%target%" >nul
     19  ) else if "%PROCESSOR_ARCHITECTURE%" == "x86" (
     20  FOR /F "skip=1 tokens=* usebackq" %%G IN ("%ProjectDir%\Files.x86.txt") DO copy "%SolutionDir%\%%G" "%target%" >nul
     21  ) else (
     22    echo "ERROR: unknown architecture: "%PROCESSOR_ARCHITECTURE%"
     23  )
     24) else (
     25  echo "ERROR: unknown platform: %Platform%"
     26)
     27
     28echo "CustomPostBuild done"

  • trunk/sources/HeuristicLab 3.3/HeuristicLab 3.3.csproj

    r2492 r2643  
    99    <OutputType>WinExe</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab33</RootNamespace>
    12     <AssemblyName>HeuristicLab 3.3</AssemblyName>
     11    <RootNamespace>HeuristicLab</RootNamespace>
     12    <AssemblyName>HeuristicLab</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <SignAssembly>true</SignAssembly>
    1616    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    17     <StartupObject>HeuristicLab33.Program</StartupObject>
     17    <StartupObject>HeuristicLab.Program</StartupObject>
    1818    <RunPostBuildEvent>Always</RunPostBuildEvent>
    1919    <ApplicationIcon>HeuristicLab.ico</ApplicationIcon>
    … …  
    6868    <None Include="app.config" />
    6969    <None Include="CopyAssemblies.cmd" />
     70    <None Include="CreateConsoleApplication.cmd" />
    7071    <None Include="CustomPostBuild.cmd" />
    7172    <None Include="CustomPostBuildTemplate_UpdateLocalInstallation.cmd" />
    … …  
    8485  </ItemGroup>
    8586  <ItemGroup>
    86     <ProjectReference Include="..\HeuristicLab\HeuristicLab.csproj">
    87       <Project>{623FB817-8371-4A9A-A491-4DECC87B2BBB}</Project>
    88       <Name>HeuristicLab</Name>
     87    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
     88      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     89      <Name>HeuristicLab.PluginInfrastructure</Name>
    8990    </ProjectReference>
    9091  </ItemGroup>
    9192  <ItemGroup>
     93    <Content Include="Files.txt">
     94    </Content>
     95    <Content Include="Files.x64.txt">
     96    </Content>
     97    <Content Include="Files.x86.txt">
     98    </Content>
    9299    <Content Include="HeuristicLab.ico" />
    93100  </ItemGroup>
    … …  
    115122set Configuration=$(ConfigurationName)
    116123
     124call CreateConsoleApplication.cmd
    117125call MergeConfigs.cmd
    118126call CopyAssemblies.cmd

  • trunk/sources/HeuristicLab 3.3/MergeConfigs.cmd

    r2492 r2643  
    1 ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\%Outdir%\HeuristicLab.PluginInfrastructure.dll.config" "HeuristicLab 3.3.exe.config"
    2 ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure.GUI\%Outdir%\HeuristicLab.PluginInfrastructure.GUI.dll.config" "HeuristicLab 3.3.exe.config"
    3 ConfigMerger "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll.config" "HeuristicLab 3.3.exe.config"
    4 ConfigMerger "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\HeuristicLab.Tracing-3.2.dll.config" "HeuristicLab 3.3.exe.config"
     1ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\%Outdir%\HeuristicLab.PluginInfrastructure.dll.config" "HeuristicLab.exe.config"
     2ConfigMerger "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll.config" "HeuristicLab.exe.config"
     3ConfigMerger "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\HeuristicLab.Tracing-3.2.dll.config" "HeuristicLab.exe.config"

  • trunk/sources/HeuristicLab 3.3/Program.cs

    r2492 r2643  
    2626using System.Text;
    2727using HeuristicLab;
     28using HeuristicLab.PluginInfrastructure.Starter;
    2829
    29 namespace HeuristicLab33 {
     30namespace HeuristicLab {
    3031  static class Program {
    3132    [STAThread]
    3233    static void Main(string[] args) {
    33       try {
    34         Application.EnableVisualStyles();
    35         Application.SetCompatibleTextRenderingDefault(false);
    36         Application.Run(new MainForm());
    37       }
    38       catch (Exception ex) {
    39         ShowErrorMessageBox(ex);
    40       }
    41     }
    42 
    43     public static void ShowErrorMessageBox(Exception ex) {
    44       MessageBox.Show(BuildErrorMessage(ex),
    45                       "Error - " + ex.GetType().Name,
    46                       MessageBoxButtons.OK,
    47                       MessageBoxIcon.Error);
    48     }
    49 
    50     private static string BuildErrorMessage(Exception ex) {
    51       StringBuilder sb = new StringBuilder();
    52       sb.Append("Sorry, but something went wrong!\n\n" + ex.Message + "\n\n" + ex.StackTrace);
    53 
    54       while (ex.InnerException != null) {
    55         ex = ex.InnerException;
    56         sb.Append("\n\n-----\n\n" + ex.Message + "\n\n" + ex.StackTrace);
    57       }
    58       return sb.ToString();
     34      HeuristicLab.PluginInfrastructure.Main.Run(args);
    5935    }
    6036  }

  • trunk/sources/HeuristicLab 3.3/Properties/Resources.Designer.cs

    r2492 r2643  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab33.Properties {
     11namespace HeuristicLab.Properties {
    1212    using System;
    1313   
    … …  
    4040            get {
    4141                if (object.ReferenceEquals(resourceMan, null)) {
    42                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab33.Properties.Resources", typeof(Resources).Assembly);
     42                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Properties.Resources", typeof(Resources).Assembly);
    4343                    resourceMan = temp;
    4444                }

  • trunk/sources/HeuristicLab 3.3/Properties/Settings.Designer.cs

    r2492 r2643  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab33.Properties {
     11namespace HeuristicLab.Properties {
    1212   
    1313   

  • trunk/sources/HeuristicLab 3.3/Properties/Settings.settings

    r2492 r2643  
    11<?xml version='1.0' encoding='utf-8'?>
    2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab33.Properties" GeneratedClassName="Settings">
     2<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Properties" GeneratedClassName="Settings">
    33  <Profiles />
    44  <Settings>

  • trunk/sources/HeuristicLab 3.3/app.config

    r2492 r2643  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<configuration>
    3     <configSections>
    4         <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5             <section name="HeuristicLab33.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    6         </sectionGroup>
    7     </configSections>
     3  <configSections>
     4    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     6    </sectionGroup>
     7  </configSections>
    88  <connectionStrings>
    99  </connectionStrings>
     10  <system.serviceModel>
     11  </system.serviceModel>
     12  <runtime>
     13    <gcServer enabled="true"/>
     14  </runtime>
    1015
    1116  <system.data>
    … …  
    2227  </system.data>
    2328  <applicationSettings>
    24     <HeuristicLab33.Properties.Settings>
     29    <HeuristicLab.Properties.Settings>
    2530      <setting name="User" serializeAs="String">
    2631        <value>unknown</value>
    … …  
    2934        <value>unknown</value>
    3035      </setting>
    31     </HeuristicLab33.Properties.Settings>
     36    </HeuristicLab.Properties.Settings>
    3237  </applicationSettings>
    3338</configuration>
Note: See TracChangeset for help on using the changeset viewer.