Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@caoxk
caoxk committed Nov 4, 2013
1 parent a348cf5 commit 5ab0f14
Show file tree
Hide file tree
Showing 14 changed files with 77 additions and 402 deletions.
22 changes: 11 additions & 11 deletions AzurePackage.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ArtifactsFolder>$(MSBuildProjectDirectory)\artifacts\Azure</ArtifactsFolder>

<StageFolder>$(BuildFolder)\Stage</StageFolder>
<CloudRootFolder>$(SrcFolder)\Orchard.Azure\Orchard.Azure.Web\obj\Release</CloudRootFolder>
<CloudRootFolder>$(SrcFolder)\Coevery.Azure\Coevery.Azure.Web\obj\Release</CloudRootFolder>
<MsDeployFolder>$(CloudRootFolder)\Package\PackageTmp</MsDeployFolder>

</PropertyGroup>
Expand Down Expand Up @@ -45,7 +45,7 @@
<!-- Building -->

<Target Name="Clean">
<MSBuild Projects="$(SrcFolder)\Orchard.Azure\Orchard.Azure.sln" Targets="Clean" />
<MSBuild Projects="$(SrcFolder)\Coevery.Azure\Coevery.Azure.sln" Targets="Clean" />
<RemoveDir Directories="$(BuildFolder)" ContinueOnError="true" />
<RemoveDir Directories="$(MsDeployFolder)" ContinueOnError="true" />
</Target>
Expand All @@ -54,13 +54,13 @@

<!-- behaves like MsDeploy since Azure SDK 1.4, output is $(MsDeployFolder) -->
<MSBuild
Projects="$(SrcFolder)\Orchard.Azure\Orchard.Azure.sln"
Projects="$(SrcFolder)\Coevery.Azure\Coevery.Azure.sln"
Targets="Build"
Properties="Configuration=Release;DeployOnBuild=true;DeployTarget=Package;Platform=Any CPU"
/>

<MSBuild
Projects="$(SrcFolder)\Orchard.Azure.Tests\Orchard.Azure.Tests.sln"
Projects="$(SrcFolder)\Coevery.Azure.Tests\Coevery.Azure.Tests.sln"
Targets="Build"
Properties="Configuration=Release;OutputPath=$(CloudRootFolder)\Tests;Platform=Any CPU"
/>
Expand Down Expand Up @@ -88,9 +88,9 @@
<Excluded Include="$(SrcFolder)\**\bin\**\*;$(SrcFolder)\**\obj\**\*;$(SrcFolder)\**\*.user; $(SrcFolder)\**\*.cs;$(SrcFolder)\**\*.csproj;$(SrcFolder)\**\.hg\**\*" />

<!-- list of files from Themes, Core and Modules to export -->
<Stage-Themes Include="$(SrcFolder)\Orchard.Web\Themes\**\*" Exclude="@(Excluded)" />
<Stage-Core Include="$(SrcFolder)\Orchard.Web\Core\**\*" Exclude="@(Excluded)" />
<Stage-Modules Include="$(SrcFolder)\Orchard.Web\Modules\**\*" Exclude="@(Excluded)" />
<Stage-Themes Include="$(SrcFolder)\Coevery.Web\Themes\**\*" Exclude="@(Excluded)" />
<Stage-Core Include="$(SrcFolder)\Coevery.Web\Core\**\*" Exclude="@(Excluded)" />
<Stage-Modules Include="$(SrcFolder)\Coevery.Web\Modules\**\*" Exclude="@(Excluded)" />
</ItemGroup>

<Copy SourceFiles="@(Stage-Themes)" DestinationFolder="$(MsDeployFolder)\Themes\%(RecursiveDir)" />
Expand All @@ -104,12 +104,12 @@
<Delete Files="@(WebConfigs)" />

<Copy
SourceFiles="$(SrcFolder)\Orchard.Azure\Orchard.Azure.CloudService\ServiceConfiguration.cscfg"
SourceFiles="$(SrcFolder)\Coevery.Azure\Coevery.Azure.CloudService\ServiceConfiguration.cscfg"
DestinationFolder="$(StageFolder)"
/>

<Copy
SourceFiles="$(SrcFolder)\Orchard.Azure\Orchard.Azure.CloudService\Properties.txt"
SourceFiles="$(SrcFolder)\Coevery.Azure\Coevery.Azure.CloudService\Properties.txt"
DestinationFolder="$(CloudRootFolder)"
/>

Expand All @@ -126,14 +126,14 @@

<Target Name="Package-Stage">
<Exec
Command="&quot;$(ServiceHostingSDKBinDir)cspack&quot; &quot;$(SrcFolder)\Orchard.Azure\Orchard.Azure.CloudService\ServiceDefinition.csdef&quot; /role:Orchard.Azure.Web;&quot;$(MsDeployFolder)&quot;;Orchard.Azure.Web.dll /sites:Orchard.Azure.Web;Web;&quot;$(MsDeployFolder)&quot; /rolePropertiesFile:Orchard.Azure.Web;&quot;$(CloudRootFolder)\Properties.txt&quot; /out:&quot;$(StageFolder)\Orchard.Azure.Web.cspkg&quot;"
Command="&quot;$(ServiceHostingSDKBinDir)cspack&quot; &quot;$(SrcFolder)\Coevery.Azure\Coevery.Azure.CloudService\ServiceDefinition.csdef&quot; /role:Coevery.Azure.Web;&quot;$(MsDeployFolder)&quot;;Coevery.Azure.Web.dll /sites:Coevery.Azure.Web;Web;&quot;$(MsDeployFolder)&quot; /rolePropertiesFile:Coevery.Azure.Web;&quot;$(CloudRootFolder)\Properties.txt&quot; /out:&quot;$(StageFolder)\Coevery.Azure.Web.cspkg&quot;"
WorkingDirectory="$(MsDeployFolder)"
/>
</Target>

<Target Name="Package-Zip">
<ItemGroup>
<Zip-Stage Include="$(StageFolder)\ServiceConfiguration.cscfg;$(StageFolder)\Orchard.Azure.Web.cspkg" />
<Zip-Stage Include="$(StageFolder)\ServiceConfiguration.cscfg;$(StageFolder)\Coevery.Azure.Web.cspkg" />
</ItemGroup>

<MakeDir Directories="$(ArtifactsFolder)" />
Expand Down
19 changes: 11 additions & 8 deletions CREDITS.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
Orchard Project
ASP.NET Open Source Gallery at Outercurve Foundation
Copyright 2009-2011 Outercurve Foundation
Coevery Project
Copyright 2003-2013 Nova Software

This product includes software developed at
The Outercurve Foundation (http://www.outercurve.org/).

Orchard includes works distributed under the licenses listed below. The full text for most of the licenses listed below can be found in the LICENSE.txt file accompanying each work. The original copyright notices have been preserved within the respective files and or packages. Please refer to the specific files and/or packages for more detailed information about the authors, copyright notices, and licenses.
Coevery includes works distributed under the licenses listed below. The full text for most of the licenses listed below can be found in the LICENSE.txt file accompanying each work. The original copyright notices have been preserved within the respective files and or packages. Please refer to the specific files and/or packages for more detailed information about the authors, copyright notices, and licenses.

Antlr
-----
Expand Down Expand Up @@ -201,7 +197,7 @@ MySQL Connectors
Copyright: Copyright (c) 2004, 2011, Oracle and/or its affiliates
License: GNU GENERAL PUBLIC LICENSE Version 2; Oracle�s Free and Open Source Software ("FOSS") License Exception

In order to comply with Section 2(a) of the FOSS License Exception, Outercurve Foundation hereby offers any recipient of this package a machine-readable copy of the corresponding source code for Oracle's MySQL Client Libraries upon written demand.� This offer is good for three years.
In order to comply with Section 2(a) of the FOSS License Exception, Outercurve Foundation hereby offers any recipient of this package a machine-readable copy of the corresponding source code for Oracle's MySQL Client Libraries upon written demand.?This offer is good for three years.

NHibernate, NHibernate Linq
-----
Expand All @@ -228,6 +224,13 @@ Copyright: Copyright (c) 2002-2007 NUnit.org
Portions Copyright (c) 2002-2008 Charlie Poole or Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 Philip A. Craig
License: Derived from zlib: http://nunit.org/index.php?p=license&r=2.4

Orchard
-----
Website: http://www.orchardproject.net/
Copyright: Copyright (c) 2009 Outercurve Foundation
License: New BSD


SpecFlow
-----
Website: http://www.specflow.org/
Expand Down
58 changes: 29 additions & 29 deletions Orchard.proj → Coevery.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<MsDeployArtifactFolder>$(ArtifactsFolder)\MsDeploy</MsDeployArtifactFolder>
<GalleryArtifactFolder>$(ArtifactsFolder)\Gallery</GalleryArtifactFolder>
<ModulesSrcFolder>$(MSBuildProjectDirectory)\src\Coevery.Web\Modules</ModulesSrcFolder>
<OrchardCoreSrcFolder>$(MSBuildProjectDirectory)\src\Coevery.Web\Core</OrchardCoreSrcFolder>
<CoeveryCoreSrcFolder>$(MSBuildProjectDirectory)\src\Coevery.Web\Core</CoeveryCoreSrcFolder>
<ThemesSrcFolder>$(MSBuildProjectDirectory)\src\Coevery.Web\Themes</ThemesSrcFolder>

<CompileFolder>$(BuildFolder)\Compile</CompileFolder>
Expand Down Expand Up @@ -162,10 +162,10 @@

<UsingTask AssemblyFile="$(LibFolder)\slowcheetah\SlowCheetah.Xdt.dll" TaskName="SlowCheetah.Xdt.TransformXml" />

<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FilterModuleBinaries" />
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FileUpdateLines" />
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.ValidateExtensionProjectFiles" />
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.XmlDelete" />
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Coevery.Tasks.dll" TaskName="MSBuild.Coevery.Tasks.FilterModuleBinaries" />
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Coevery.Tasks.dll" TaskName="MSBuild.Coevery.Tasks.FileUpdateLines" />
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Coevery.Tasks.dll" TaskName="MSBuild.Coevery.Tasks.ValidateExtensionProjectFiles" />
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Coevery.Tasks.dll" TaskName="MSBuild.Coevery.Tasks.XmlDelete" />

<Target Name="Package-Stage" DependsOnTargets="Compile">
<CallTarget Targets="CompileMsBuildTasks"/>
Expand All @@ -174,13 +174,13 @@
<ItemGroup>
<SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\**\*"/>
<SqlCe-Native-Binaries-amd64 Include="$(SqlCeFolder)\amd64\**\*"/>
<Stage-Orchard-Web-Bins Include="$(WebSitesFolder)\Orchard.Web\bin\*"/>
<Stage-Coevery-Web-Bins Include="$(WebSitesFolder)\Coevery.Web\bin\*"/>
<Stage-Bin-Exclude Include="$(WebSitesFolder)\**\bin\**\*" />
<Stage-Web Include="$(WebSitesFolder)\Orchard.Web\**\*;$(SrcFolder)\Orchard.Web\*.csproj;" Exclude="$(SrcFolder)\Orchard.Web\Orchard.Web.csproj;$(SrcFolder)\Orchard.Web\**\*.Release.config;$(SrcFolder)\Orchard.Web\**\*.Debug.config"/>
<Stage-Web-Config Include="$(SrcFolder)\Orchard.Web\**\*.config" Exclude="$(SrcFolder)\Orchard.Web\**\*.Release.config;$(SrcFolder)\Orchard.Web\**\*.Debug.config"/>
<Stage-Media Include="$(SrcFolder)\Orchard.Web\Media\OrchardLogo.png" />
<Stage-PoFiles Include="$(SrcFolder)\Orchard.Web\**\*.po" />
<Stage-Core Include="$(WebSitesFolder)\Orchard.Core\**\*" Exclude="$(WebSitesFolder)\Orchard.Core\**\bin\**\*" />
<Stage-Web Include="$(WebSitesFolder)\Coevery.Web\**\*;$(SrcFolder)\Coevery.Web\*.csproj;" Exclude="$(SrcFolder)\Coevery.Web\Coevery.Web.csproj;$(SrcFolder)\Coevery.Web\**\*.Release.config;$(SrcFolder)\Coevery.Web\**\*.Debug.config"/>
<Stage-Web-Config Include="$(SrcFolder)\Coevery.Web\**\*.config" Exclude="$(SrcFolder)\Coevery.Web\**\*.Release.config;$(SrcFolder)\Coevery.Web\**\*.Debug.config"/>
<Stage-Media Include="$(SrcFolder)\Coevery.Web\Media\CoeveryLogo.png" />
<Stage-PoFiles Include="$(SrcFolder)\Coevery.Web\**\*.po" />
<Stage-Core Include="$(WebSitesFolder)\Coevery.Core\**\*" Exclude="$(WebSitesFolder)\Coevery.Core\**\bin\**\*" />
<Stage-Themes Include="$(ThemesSrcFolder)\**\*" Exclude="@(Stage-Bin-Exclude);$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\bin\**;$(ThemesSrcFolder)\obj\**;$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\Properties\**" />
<Stage-Themes-Binaries Include="$(ThemesSrcFolder)\*\**\bin\*" />

Expand All @@ -195,15 +195,15 @@

<!-- Copying module binaries is somewhat tricky: From a module "bin" directory, we
only want to include the files that are _not_ already present in
the "Orchard.Web\Bin" folder. -->
the "Coevery.Web\Bin" folder. -->
<FilterModuleBinaries
ModulesBinaries="@(Stage-Modules-Binaries)"
OrchardWebBinaries="@(Stage-Orchard-Web-Bins)">
CoeveryWebBinaries="@(Stage-Coevery-Web-Bins)">
<Output TaskParameter="ExcludedBinaries" ItemName="FilterModuleBinaries-ExcludedBinaries"/>
</FilterModuleBinaries>
<FilterModuleBinaries
ModulesBinaries="@(Stage-Themes-Binaries)"
OrchardWebBinaries="@(Stage-Orchard-Web-Bins)">
CoeveryWebBinaries="@(Stage-Coevery-Web-Bins)">
<Output TaskParameter="ExcludedBinaries" ItemName="FilterThemeBinaries-ExcludedBinariesFromThemes"/>
</FilterModuleBinaries>

Expand All @@ -230,24 +230,24 @@
<!-- extra processing of the staged config files -->
<TransformXml
Source="$(StageFolder)\Web.Config"
Transform="$(SrcFolder)\Orchard.Web\Web.Release.Config"
Transform="$(SrcFolder)\Coevery.Web\Web.Release.Config"
Destination="$(StageFolder)\Web.Config"
/>

<TransformXml
Source="$(StageFolder)\Config\HostComponents.Config"
Transform="$(SrcFolder)\Orchard.Web\Config\HostComponents.Release.Config"
Transform="$(SrcFolder)\Coevery.Web\Config\HostComponents.Release.Config"
Destination="$(StageFolder)\Config\HostComponents.Config"
/>

<TransformXml
Source="$(StageFolder)\Config\log4net.Config"
Transform="$(SrcFolder)\Orchard.Web\Config\log4net.Release.Config"
Transform="$(SrcFolder)\Coevery.Web\Config\log4net.Release.Config"
Destination="$(StageFolder)\Config\log4net.Config"
/>

<!-- move over extra non-content files the csproj referenced -->
<Copy SourceFiles="@(StageProjectAlteration-ExtraFiles->'$(SrcFolder)\Orchard.Web\%(Identity)')"
<Copy SourceFiles="@(StageProjectAlteration-ExtraFiles->'$(SrcFolder)\Coevery.Web\%(Identity)')"
DestinationFolder="$(StageFolder)\%(RecursiveDir)"/>

</Target>
Expand All @@ -258,22 +258,22 @@
<!--<MsDeploy-Folder-Input Include="$(StageFolder)\**\*" Exclude="$(StageFolder)\**\bin\**\*.pdb;$(StageFolder)\**\bin\**\*.xml" />-->

<MsDeploy-Exclude-Modules Include="
$(StageFolder)\**\Modules\Orchard.Lists\**;
$(StageFolder)\**\Modules\Orchard.Media\**;
$(StageFolder)\**\Modules\Orchard.MediaPicker\**;
$(StageFolder)\**\Modules\Orchard.Rules\**;
$(StageFolder)\**\Modules\Coevery.Lists\**;
$(StageFolder)\**\Modules\Coevery.Media\**;
$(StageFolder)\**\Modules\Coevery.MediaPicker\**;
$(StageFolder)\**\Modules\Coevery.Rules\**;
" />

<MsDeploy-Folder-Input Include="$(StageFolder)\**\*" Exclude="$(StageFolder)\**\bin\**\*.xml;$(StageFolder)\**\obj\**\*;@(MsDeploy-Exclude-Modules)" />
<MsDeploy-Parameters Include="$(LibFolder)\msdeploy\*.xml;$(LibFolder)\msdeploy\*.sql"/>
</ItemGroup>

<Copy SourceFiles="@(MsDeploy-Folder-Input)"
DestinationFolder="$(MsDeployFolder)\Orchard\%(RecursiveDir)"/>
DestinationFolder="$(MsDeployFolder)\Coevery\%(RecursiveDir)"/>
<Copy SourceFiles="@(MsDeploy-Parameters)"
DestinationFolder="$(MsDeployFolder)"/>

<MakeDir Directories="$(MsDeployFolder)\Orchard\bin\HostRestart"/>
<MakeDir Directories="$(MsDeployFolder)\Coevery\bin\HostRestart"/>
</Target>

<!-- Packaging (Precompiled) -->
Expand Down Expand Up @@ -325,8 +325,8 @@
<ZipVersionFileSuffix Condition="$(Version) == ''"></ZipVersionFileSuffix>
</PropertyGroup>

<Zip Files="@(Zip-MsDeploy)" WorkingDirectory="$(MsDeployFolder)" ZipFileName="$(MsDeployArtifactFolder)\Orchard.Web$(ZipVersionFileSuffix).zip" />
<Zip Files="@(Zip-Source)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(SourceArtifactFolder)\Orchard.Source$(ZipVersionFileSuffix).zip" />
<Zip Files="@(Zip-MsDeploy)" WorkingDirectory="$(MsDeployFolder)" ZipFileName="$(MsDeployArtifactFolder)\Coevery.Web$(ZipVersionFileSuffix).zip" />
<Zip Files="@(Zip-Source)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(SourceArtifactFolder)\Coevery.Source$(ZipVersionFileSuffix).zip" />
</Target>

<!-- Profiling -->
Expand All @@ -345,11 +345,11 @@
</Target>

<Target Name="Profiling-Setup">
<ReadLinesFromFile File="$(SrcFolder)\Orchard.Profile\profiling-setup-commands.txt">
<ReadLinesFromFile File="$(SrcFolder)\Coevery.Profile\profiling-setup-commands.txt">
<Output TaskParameter="Lines" ItemName="ProfilingSetupCommands"/>
</ReadLinesFromFile>

<Exec Command="$(ProfilingFolder)\bin\Orchard.exe %(ProfilingSetupCommands.Identity)" WorkingDirectory="$(ProfilingFolder)"/>
<Exec Command="$(ProfilingFolder)\bin\Coevery.exe %(ProfilingSetupCommands.Identity)" WorkingDirectory="$(ProfilingFolder)"/>
</Target>

<!-- Gallery Packaging -->
Expand Down Expand Up @@ -377,7 +377,7 @@

<ItemGroup>
<Validate-ProjectFiles
Include="$(ModulesSrcFolder)\**\*.csproj;$(ThemesSrcFolder)\**\*.csproj;$(OrchardCoreSrcFolder)\Orchard.Core.csproj"
Include="$(ModulesSrcFolder)\**\*.csproj;$(ThemesSrcFolder)\**\*.csproj;$(CoeveryCoreSrcFolder)\Coevery.Core.csproj"
Exclude="$(ModulesSrcFolder)\**\*.Specs.csproj"
/>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion DeleteModuleBinaries.cmd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
REM Delete all compiled module binaries to force dynamic compilation (.csproj) to kick in
set SRC=src\Orchard.Web\Modules
set SRC=src\Coevery.Web\Modules
for /f %%i in ('dir %SRC% /b /ad') do del /q %SRC%\%%i\bin\%%i.dll
Loading

0 comments on commit 5ab0f14

Please sign in to comment.