still refactoring
parent
d0668c3da5
commit
05879375e5
@ -1,8 +0,0 @@
|
||||
namespace Yavsc.Abstract
|
||||
{
|
||||
public class ConstantsFromAbstract
|
||||
{
|
||||
public const string EMailRegexp = @"^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$";
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,34 +1,3 @@
|
||||
CONFIGURATION=Release
|
||||
PRJNAME=Yavsc.Abstract
|
||||
BINTARGET=$(PRJNAME).dll
|
||||
PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
|
||||
DESTPATH=.
|
||||
PACKAGE=$(DESTPATH)/$(PKGFILENAME)
|
||||
BINARY=bin/$(CONFIGURATION)//$(PRJNAME).dll
|
||||
FRAMEWORKALIAS=net451
|
||||
BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
|
||||
NUGETSOURCE=$(HOME)/Nupkgs/
|
||||
|
||||
all: $(BINTARGETPATH)
|
||||
|
||||
$(BINTARGETPATH):
|
||||
dnu build
|
||||
|
||||
|
||||
$(PACKAGE): $(BINARY)
|
||||
nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION)
|
||||
|
||||
clean:
|
||||
rm $(PACKAGE)
|
||||
|
||||
$(BINARY): project.lock.json
|
||||
dnu build --configuration $(CONFIGURATION)
|
||||
|
||||
project.lock.json: project.json
|
||||
dnu restore
|
||||
|
||||
deploy-pkg: $(PACKAGE)
|
||||
cp $(PACKAGE) $(NUGETSOURCE)
|
||||
|
||||
.PHONY: $(PACKAGE)
|
||||
include ../versioning.mk
|
||||
include ../dnx.mk
|
||||
|
||||
|
||||
@ -1,2 +1,5 @@
|
||||
include ../common.mk
|
||||
include ../versioning.mk
|
||||
include ../dnx.mk
|
||||
|
||||
all: $(BINTARGETPATH)
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
15
|
||||
@ -1 +0,0 @@
|
||||
15
|
||||
@ -1,22 +0,0 @@
|
||||
#!/bin/sh
|
||||
PRJS="YavscLib/YavscLib ZicMoove/ZicMoove/ZicMoove ZicMoove/ZicMoove.Droid/ZicMoove.Droid"
|
||||
MSB=msbuild.exe
|
||||
|
||||
if [ "clean" = "$1" ]; then
|
||||
echo \< $1
|
||||
rm -rf YavscLib/YavscLib/obj ZicMoove/*/obj
|
||||
fi
|
||||
|
||||
for p in $PRJS
|
||||
do
|
||||
|
||||
nuget restore $p.csproj -PackagesDirectory packages
|
||||
|
||||
done
|
||||
|
||||
$MSB /t:UpdateAndroidResources /p:Configuration=Debug ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj
|
||||
|
||||
for p in $PRJS
|
||||
do
|
||||
$MSB /t:Build /p:Configuration=Debug $p.csproj
|
||||
done
|
||||
@ -1,27 +1,22 @@
|
||||
#!/bin/sh
|
||||
PRJS="YavscLib/YavscLib ZicMoove/ZicMoove/ZicMoove ZicMoove/ZicMoove.Droid/ZicMoove.Droid"
|
||||
MSB=msbuild.exe
|
||||
|
||||
BUILDCMD=MSBuild.exe
|
||||
|
||||
PATH+=':/cygdrive/c/cygwin64/bin'
|
||||
if [ "clean" = "$1" ]; then
|
||||
echo \< $1
|
||||
rm -rf YavscLib/YavscLib/obj ZicMoove/*/obj
|
||||
fi
|
||||
|
||||
for p in 'C:\Program Files (x86)\MSBuild\14.0\Bin' 'C:\Users\paul\bin' 'C:\Users\paul\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc1-update2\bin' 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools' 'C:\Program Files (x86)\Microsoft Visual Studio14.0\Common7\IDE\' 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN' 'C:\Windows\Microsoft.NET\Framework\v4.0.30319' 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages' 'C:\Program Files (x86)\HTML Help Workshop' 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools' 'C:\Program Files (x86)\Windows Kits\10\bin\x86' 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\' 'C:\ProgramData\Oracle\Java\javapath' 'C:\Program Files\dotnet' 'C:\Program Files (x86)\Microsoft VS Code\bin'
|
||||
for p in $PRJS
|
||||
do
|
||||
PATH+=:`cygpath $p`
|
||||
done
|
||||
|
||||
|
||||
if [[ "$BUILDCONFIG" == "" ]]
|
||||
then
|
||||
BUILDCONFIG="Lua Yavsc ZicMoove Debug"
|
||||
fi
|
||||
echo "Building $BUILDCONFIG ..."
|
||||
nuget restore $p.csproj -PackagesDirectory packages
|
||||
|
||||
for conf in $BUILDCONFIG
|
||||
do
|
||||
$BUILDCMD /p:Configuration=$conf /t:SignAndroidPackage ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj /logger:"Kobush.Build.Logging.XmlLogger,Kobush.Build.dll;build-$conf-result.xml"
|
||||
xsltproc -o "build-$conf-result.html" "msbuild.xsl" "build-$conf-result.xml"
|
||||
done
|
||||
|
||||
$MSB /t:UpdateAndroidResources /p:Configuration=Debug ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj
|
||||
|
||||
# ;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow
|
||||
# \;;;;;;;;;;C:\Program Files (x86)\PHP\;C:\csvn\bin\;C:\csvn\Python25\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\MiKTeX 2.9\miktex\bin\x64\;C:\Program Files (x86)\GtkSharp\2.12\bin;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files\Git\cmd;\;
|
||||
for p in $PRJS
|
||||
do
|
||||
$MSB /t:Build /p:Configuration=Debug $p.csproj
|
||||
done
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,28 +1,19 @@
|
||||
include ../common.mk
|
||||
include ../versioning.mk
|
||||
include ../dnx.mk
|
||||
|
||||
MSBUILD=msbuild
|
||||
|
||||
|
||||
all: build
|
||||
|
||||
build: project.lock.json
|
||||
ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnu build --configuration=$(CONFIGURATION)
|
||||
|
||||
restore:
|
||||
touch project.json
|
||||
dnu restore
|
||||
all: $(BINTARGETPATH)
|
||||
|
||||
msbuild-restore:
|
||||
$(MSBUILD) cli.csproj /t:Restore
|
||||
|
||||
project.lock.json: project.json
|
||||
dnu restore
|
||||
|
||||
run: project.lock.json
|
||||
ASPNET_ENV=Development ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx run --configuration=$(CONFIGURATION)
|
||||
ASPNET_ENV=$(ASPNET_ENV) dnx run --configuration=$(CONFIGURATION)
|
||||
|
||||
info:
|
||||
@echo $(PRJNAME)
|
||||
|
||||
|
||||
deploy-pkg: $(PACKAGE)
|
||||
cp $(PACKAGE) $(NUGETSOURCE)
|
||||
|
||||
.PHONY: $(BINARY)
|
||||
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,26 @@
|
||||
<?xml version="1.0"?>
|
||||
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||
<id>cli</id>
|
||||
<title>Yavsc - cli</title>
|
||||
<version>$version$</version>
|
||||
<authors>Paul Schneider</authors>
|
||||
<owners>Paul Schneider</owners>
|
||||
<licenseUrl>https://github.com/pazof/yavsc/blob/vnext/Yavsc/License.md</licenseUrl>
|
||||
<projectUrl>https://github.com/pazof/yavsc/README.md</projectUrl>
|
||||
<iconUrl>https://github.com/pazof/yavsc/blob/vnext/Yavsc/wwwroot/images/yavsc.png</iconUrl>
|
||||
<requireLicenseAcceptance>true</requireLicenseAcceptance>
|
||||
<description>
|
||||
A command line interface to Yavsc server runtime
|
||||
</description>
|
||||
<summary>
|
||||
</summary>
|
||||
<tags>Blog, POS, Web API</tags>
|
||||
<dependencies>
|
||||
<dependency id="Yavsc.Server" version="$version$"></dependency>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin/$config$/dnx451/cli.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
|
||||
</files>
|
||||
</package>
|
||||
@ -1,87 +0,0 @@
|
||||
# Common defs
|
||||
|
||||
MAKE=make
|
||||
FRAMEWORK=dnx451
|
||||
rc_num := $(shell cat rc-num.txt)
|
||||
VERSION=1.0.5-rc$(rc_num)
|
||||
CONFIGURATION=Release
|
||||
PRJNAME := $(shell basename `pwd -P` .dll)
|
||||
PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
|
||||
BINARY=bin/$(CONFIGURATION)/$(FRAMEWORK)/$(PRJNAME).dll
|
||||
NUGETSOURCE=$(HOME)/Nupkgs/
|
||||
ASPNET_ENV=Development
|
||||
ASPNET_LOG_LEVEL=Debug
|
||||
# nuget package destination, at generation time
|
||||
HOSTING=localhost
|
||||
HOSTADMIN=root
|
||||
FRAMEWORKALIAS=dnx451
|
||||
BINTARGET=$(PRJNAME).dll
|
||||
BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
|
||||
|
||||
# OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli
|
||||
#
|
||||
|
||||
# Git commit hash, in order to not publish some uncrontrolled code in production environment
|
||||
#
|
||||
|
||||
git_status := $(shell git status -s --porcelain |wc -l)
|
||||
|
||||
all: build
|
||||
|
||||
rc-num.txt:
|
||||
ifndef rc-num
|
||||
@echo Generating rc-num.txt with: $(shell cat ../rc-num.txt || echo 1) > $@
|
||||
@echo $(shell cat ../rc-num.txt || echo 1) > $@
|
||||
rc_num := $(shell cat rc-num.txt)
|
||||
else
|
||||
@echo 'Got rc num : $(rc_num)'
|
||||
endif
|
||||
|
||||
rc-num.txt-check: rc-num.txt
|
||||
ifndef rc_num
|
||||
@echo no rc num ... please, run 'make rc-num.txt' before.
|
||||
else
|
||||
@echo 'Got rc num : $(rc_num)'
|
||||
endif
|
||||
|
||||
restore:
|
||||
touch project.json
|
||||
dnu restore
|
||||
|
||||
project.lock.json: project.json
|
||||
dnu restore
|
||||
|
||||
watch: project.lock.json
|
||||
ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx-watch web --configuration=$(CONFIGURATION)
|
||||
|
||||
run: project.lock.json
|
||||
ASPNET_ENV=$(ASPNET_ENV) dnx web --configuration=$(CONFIGURATION)
|
||||
|
||||
clean:
|
||||
rm -rf bin obj
|
||||
|
||||
cleanoutput:
|
||||
rm -rf bin/$(CONFIGURATION)
|
||||
rm -rf bin/output
|
||||
|
||||
$(BINTARGETPATH): project.lock.json
|
||||
dnu build --configuration=$(CONFIGURATION)
|
||||
|
||||
build: $(BINTARGETPATH)
|
||||
|
||||
bin/output:
|
||||
@dnu publish
|
||||
|
||||
bin/output/wwwroot/version: bin/output
|
||||
@git log -1 --pretty=format:%h > bin/output/wwwroot/version
|
||||
|
||||
$(PKGFILENAME): $(BINARY) rc-num.txt
|
||||
nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION)
|
||||
|
||||
$(NUGETSOURCE)/$(PRJNAME):
|
||||
mkdir -P $^
|
||||
|
||||
deploy-pkg: $(PKGFILENAME)
|
||||
cp $(PKGFILENAME) $(NUGETSOURCE)
|
||||
|
||||
.PHONY: rc-num.txt-check
|
||||
@ -1,9 +1,73 @@
|
||||
include common.mk
|
||||
# Common defs
|
||||
# assumes SOLUTIONDIR already defined
|
||||
#
|
||||
|
||||
$(BINTARGETPATH):
|
||||
dnu build
|
||||
PRJNAME := $(shell basename `pwd -P`)
|
||||
FRAMEWORK=dnx451
|
||||
ASPNET_ENV=Development
|
||||
ASPNET_LOG_LEVEL=Debug
|
||||
HOSTING=localhost
|
||||
HOSTADMIN=root
|
||||
FRAMEWORKALIAS=dnx451
|
||||
BINTARGET=$(PRJNAME).dll
|
||||
BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
|
||||
|
||||
build: project.
|
||||
$(DNU) build
|
||||
# OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli
|
||||
#
|
||||
|
||||
# Git commit hash, in order to not publish some uncrontrolled code in production environment
|
||||
#
|
||||
|
||||
git_status := $(shell git status -s --porcelain |wc -l)
|
||||
|
||||
all: $(BINTARGETPATH)
|
||||
|
||||
rc-num.txt-check:
|
||||
ifndef rc_num
|
||||
@echo no rc num ... please, could you try and run 'make rc-num.txt' ?.
|
||||
else
|
||||
@echo 'Got rc num : $(rc_num)'
|
||||
endif
|
||||
|
||||
|
||||
restore:
|
||||
touch project.json
|
||||
dnu restore
|
||||
|
||||
project.lock.json: project.json
|
||||
dnu restore
|
||||
|
||||
watch: project.lock.json
|
||||
ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx-watch web --configuration=$(CONFIGURATION)
|
||||
|
||||
clean:
|
||||
rm -rf bin obj
|
||||
|
||||
cleanoutput:
|
||||
rm -rf bin/$(CONFIGURATION)
|
||||
rm -rf bin/output
|
||||
|
||||
$(BINTARGETPATH): project.json rc-num.txt-check
|
||||
dnu build --configuration=$(CONFIGURATION)
|
||||
|
||||
# Default target, from one level sub dirs
|
||||
|
||||
bin/output:
|
||||
@dnu publish
|
||||
|
||||
bin/output/wwwroot/version: bin/output
|
||||
@git log -1 --pretty=format:%h > bin/output/wwwroot/version
|
||||
|
||||
$(NUGETSOURCE)/$(PRJNAME)/$(PKGFILENAME): $(NUGETSOURCE)/$(PRJNAME) $(BINTARGETPATH) $(SOLUTIONDIR)/rc-num.txt
|
||||
nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) -OutputDirectory $(NUGETSOURCE)/$(PRJNAME)
|
||||
|
||||
$(NUGETSOURCE)/$(PRJNAME):
|
||||
mkdir -p $@
|
||||
|
||||
deploy-pkg: $(NUGETSOURCE)/$(PRJNAME)/$(PKGFILENAME)
|
||||
|
||||
.PHONY: rc-num.txt-check $(BINTARGETPATH)
|
||||
|
||||
.DEFAULT_GOAL :=
|
||||
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
15
|
||||
18-alpha1
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
|
||||
PRJNAME := $(shell basename `pwd -P`)
|
||||
SOLUTIONDIR=$(HOME)/workspace/yavsc
|
||||
rc_num := $(shell cat $(SOLUTIONDIR)/rc-num.txt)
|
||||
DESTDIR=$(SOLUTIONDIR)/build
|
||||
MAKE=make
|
||||
VERSION=1.0.5-rc$(rc_num)
|
||||
CONFIGURATION=Release
|
||||
# nuget package destination, at generation time
|
||||
NUGETSOURCE=$(HOME)/Nupkgs
|
||||
PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
|
||||
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
{
|
||||
"version": "1.0.0-*",
|
||||
"frameworks": {
|
||||
"net45+win+wpa81+MonoAndroid10+Xamarin.iOS10+MonoTouch10": {
|
||||
"wrappedProject": "../../Yavsc.Client/Yavsc.Client.csproj",
|
||||
"bin": {
|
||||
"assembly": "../../Yavsc.Client/obj/{configuration}/Yavsc.Client.dll",
|
||||
"pdb": "../../Yavsc.Client/obj/{configuration}/Yavsc.Client.pdb"
|
||||
},
|
||||
"dependencies": {
|
||||
"Json.NET.Web": "1.0.49",
|
||||
"Newtonsoft.Json": "9.0.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{
|
||||
"version": "1.0.0-*",
|
||||
"frameworks": {
|
||||
"net45+win+wpa81+MonoAndroid10+Xamarin.iOS10+MonoTouch10": {
|
||||
"bin": {
|
||||
"assembly": "../../../../../../../Program Files (x86)/Reference Assemblies/Microsoft/Framework/MonoAndroid/v1.0/mscorlib.dll"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue