Changeset 1451 for trunk/CrypStartup


Ignore:
Timestamp:
May 20, 2010, 9:37:45 PM (12 years ago)
Author:
Arno Wacker
Message:

Public Solution:

  • Major cleanup: now only x86/x64 + Release/Debug available

Project fixes

  • Fixed errornous paths in ADFGVX.csproj
  • Fixed output path for PeerToPeerBaseProxy, PeerToPeer, VigenereAnalyser (pointing now to plugin directory)

CrypP2P:

  • Removed KeySearch-dependency (again)
  • PeerToPeer-reference does not do a "local copy"


CrypStartup:

  • Fixed output path (was set to plugins directory - now points to top dir)
  • Reactivated local copy of the external Ribbon-DLLs - fixes startup problem (Dir AppExternalReferences not used at the moment)
  • added icon to startup-project (still does not seem to be visible..?)

Fixed x64 and x86 project settings for Release and Debug (Note: x64 still not working in public solution, due to x86-binary of CrypWin.exe)

Location:
trunk/CrypStartup
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypStartup/CrypStartup.csproj

    r1416 r1451  
    1717    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    1818    <WarningLevel>4</WarningLevel>
     19    <PublishUrl>publish\</PublishUrl>
     20    <Install>true</Install>
     21    <InstallFrom>Disk</InstallFrom>
     22    <UpdateEnabled>false</UpdateEnabled>
     23    <UpdateMode>Foreground</UpdateMode>
     24    <UpdateInterval>7</UpdateInterval>
     25    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     26    <UpdatePeriodically>false</UpdatePeriodically>
     27    <UpdateRequired>false</UpdateRequired>
     28    <MapFileExtensions>true</MapFileExtensions>
     29    <ApplicationRevision>0</ApplicationRevision>
     30    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     31    <IsWebBootstrapper>false</IsWebBootstrapper>
     32    <UseApplicationTrust>false</UseApplicationTrust>
     33    <BootstrapperEnabled>true</BootstrapperEnabled>
    1934  </PropertyGroup>
    2035  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    3247    <DebugType>pdbonly</DebugType>
    3348    <Optimize>true</Optimize>
    34     <OutputPath>..\..\CrypBuild\x86\Release\CrypPlugins\</OutputPath>
     49    <OutputPath>..\CrypBuild\x86\Release\</OutputPath>
    3550    <DefineConstants>TRACE</DefineConstants>
    3651    <ErrorReport>prompt</ErrorReport>
     
    3954  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    4055    <DebugSymbols>true</DebugSymbols>
    41     <OutputPath>..\..\CrypBuild\x64\Debug\CrypPlugins\</OutputPath>
     56    <OutputPath>..\CrypBuild\x64\Debug\</OutputPath>
    4257    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4358    <DebugType>full</DebugType>
     
    4964  </PropertyGroup>
    5065  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    51     <OutputPath>..\..\CrypBuild\x64\Release\CrypPlugins\</OutputPath>
     66    <OutputPath>..\CrypBuild\x64\Release\</OutputPath>
    5267    <DefineConstants>TRACE</DefineConstants>
    5368    <Optimize>true</Optimize>
     
    5974    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6075  </PropertyGroup>
     76  <PropertyGroup>
     77    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     78  </PropertyGroup>
     79  <PropertyGroup>
     80    <ApplicationIcon>cryptool.ico</ApplicationIcon>
     81  </PropertyGroup>
    6182  <ItemGroup>
    6283    <Reference Include="CrypWin">
     
    6586    <Reference Include="DevComponents.WpfDock">
    6687      <HintPath>..\AppExternalReferences\DevComponents.WpfDock.dll</HintPath>
    67       <Private>False</Private>
    6888    </Reference>
    6989    <Reference Include="DevComponents.WpfEditors">
    7090      <HintPath>..\AppExternalReferences\DevComponents.WpfEditors.dll</HintPath>
    71       <Private>False</Private>
    7291    </Reference>
    7392    <Reference Include="DevComponents.WpfRibbon">
    7493      <HintPath>..\AppExternalReferences\DevComponents.WpfRibbon.dll</HintPath>
    75       <Private>False</Private>
    7694    </Reference>
    7795    <Reference Include="System" />
     
    134152    </ProjectReference>
    135153  </ItemGroup>
     154  <ItemGroup>
     155    <Resource Include="cryptool.ico" />
     156  </ItemGroup>
     157  <ItemGroup>
     158    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
     159      <Visible>False</Visible>
     160      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
     161      <Install>true</Install>
     162    </BootstrapperPackage>
     163    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     164      <Visible>False</Visible>
     165      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     166      <Install>false</Install>
     167    </BootstrapperPackage>
     168    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     169      <Visible>False</Visible>
     170      <ProductName>.NET Framework 3.5 SP1</ProductName>
     171      <Install>false</Install>
     172    </BootstrapperPackage>
     173    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     174      <Visible>False</Visible>
     175      <ProductName>Windows Installer 3.1</ProductName>
     176      <Install>true</Install>
     177    </BootstrapperPackage>
     178  </ItemGroup>
    136179  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    137180  <PropertyGroup>
    138     <PostBuildEvent>xcopy  /E /Y "..\..\..\ProjectSamples" "$(TargetDir)ProjectSamples\"
    139 xcopy  /E /Y "..\..\..\AppExternalReferences" "$(TargetDir)AppExternalReferences\"
     181    <PostBuildEvent>copy   CrypStartup.exe.config CrypWin.exe.config</PostBuildEvent>
     182  </PropertyGroup>
     183  <PropertyGroup>
     184    <PreBuildEvent>xcopy  /E /Y "..\..\..\AppExternalReferences" "$(TargetDir)AppExternalReferences\"
     185xcopy  /E /Y "..\..\..\ProjectSamples" "$(TargetDir)ProjectSamples\"
    140186xcopy  /E /Y "..\..\..\AppDataStore" "$(TargetDir)AppDataStore\"
    141187xcopy  /E /Y "..\..\..\AppReferences" "$(TargetDir)AppReferences\"
    142 xcopy  /E /Y "..\..\..\AppSpecialReferences\AnotherEditor.dll" "$(TargetDir)CrypPlugins\"
    143 copy   CrypStartup.exe.config CrypWin.exe.config</PostBuildEvent>
     188xcopy  /E /Y "..\..\..\AppSpecialReferences\AnotherEditor.dll" "$(TargetDir)CrypPlugins\"</PreBuildEvent>
    144189  </PropertyGroup>
    145190  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.