notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

* Makefile: fixed the deployment against the

Browse source 
CONFIG Makefile variable

* Web.csproj: missing files at deployment
This commit is contained in:
Paul Schneider 2014-10-27 16:24:57 +01:00
commit a2b1d6bb4e
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -1,8 +1,8 @@
CONFIG=Release CONFIG=Release
DESTDIR=../build/web/$(CONFIG) DESTDIR=build/web/$(CONFIG)
COPYUNCHANGED=false COPYUNCHANGED="false"
all: build deploy all: build deploy
@ -10,7 +10,7 @@ ddir:
mkdir -p $(DESTDIR) mkdir -p $(DESTDIR)
deploy: ddir build deploy: ddir build
xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=$(DESTDIR) /t:Deploy web/Web.csproj xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(DESTDIR) /t:Deploy web/Web.csproj
rm -rf $(DESTDIR)/obj rm -rf $(DESTDIR)/obj
rsync: rsync-preprod rsync-local rsync: rsync-preprod rsync-local
@ -22,11 +22,11 @@ clean:
xbuild /t:Clean xbuild /t:Clean
rm -rf $(DESTDIR) rm -rf $(DESTDIR)
rsync-preprod: rsync-preprod: deploy
rsync -ravu build/web/ root@lavieille.localdomain:/srv/httpd/luapre rsync -ravu build/web/$(CONFIG)/ root@lavieille.localdomain:/srv/httpd/luapre
rsync-local: rsync-local:
rsync -ravu build/web/ root@localhost:/srv/www/yavsc rsync -ravu build/web/$(CONFIG)/ root@localhost:/srv/www/yavsc
sourcepkg: sourcepkg:
git archive --format=tar --prefix=yavsc-1.1/ 1.1 | bzip2 > yavsc-1.1.tar.bz2 git archive --format=tar --prefix=yavsc-1.1/ 1.1 | bzip2 > yavsc-1.1.tar.bz2

6
web/Web.csproj
View file

@ -244,6 +244,9 @@
<Content Include="images\pgsql.png" /> <Content Include="images\pgsql.png" />
<Content Include="Views\Home\ReferencedAssemblies.aspx" /> <Content Include="Views\Home\ReferencedAssemblies.aspx" />
<Content Include="js\rangyinputs-jquery-1.1.2.js" /> <Content Include="js\rangyinputs-jquery-1.1.2.js" />
<Content Include="Catalog.xml" />
<Content Include="RegistrationMail.txt" />
<Content Include="instdbws.sql" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
@ -262,9 +265,6 @@
<None Include="README" /> <None Include="README" />
<None Include="uninstdb.sql" /> <None Include="uninstdb.sql" />
<None Include="uninstdbws.sql" /> <None Include="uninstdbws.sql" />
<None Include="instdbws.sql" />
<None Include="RegistrationMail.txt" />
<None Include="Catalog.xml" />
<None Include="templates\Estim.tt"> <None Include="templates\Estim.tt">
<Generator>TextTemplatingFilePreprocessor</Generator> <Generator>TextTemplatingFilePreprocessor</Generator>
<LastGenOutput>Estim.cs</LastGenOutput> <LastGenOutput>Estim.cs</LastGenOutput>