huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release' into dev

This commit is contained in:
Victor Hurdugaci 2015-02-17 09:19:17 -08:00
parent d56dafe2e8 afb8f51d19
commit 9354296521
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/kvm.ps1
View File

@ -23,14 +23,14 @@ param(
) )
# Constants # Constants
Set-Variable -Option Constant "BuildNumber" "10308" Set-Variable -Option Constant "BuildNumber" "10319"
Set-Variable -Option Constant "RuntimePackageName" "kre" Set-Variable -Option Constant "RuntimePackageName" "kre"
Set-Variable -Option Constant "RuntimeFriendlyName" "K Runtime" Set-Variable -Option Constant "RuntimeFriendlyName" "K Runtime"
Set-Variable -Option Constant "RuntimeShortName" "KRE" Set-Variable -Option Constant "RuntimeShortName" "KRE"
Set-Variable -Option Constant "RuntimeFolderName" ".k" Set-Variable -Option Constant "RuntimeFolderName" ".k"
Set-Variable -Option Constant "CommandName" "kvm" Set-Variable -Option Constant "CommandName" "kvm"
Set-Variable -Option Constant "VersionManagerName" "K Version Manager" Set-Variable -Option Constant "VersionManagerName" "K Version Manager"
Set-Variable -Option Constant "DefaultFeed" "https://www.myget.org/F/aspnetvnext/api/v2" Set-Variable -Option Constant "DefaultFeed" "https://www.myget.org/F/aspnetrelease/api/v2"
Set-Variable -Option Constant "CrossGenCommand" "k-crossgen" Set-Variable -Option Constant "CrossGenCommand" "k-crossgen"
Set-Variable -Option Constant "HomeEnvVar" "KRE_HOME" Set-Variable -Option Constant "HomeEnvVar" "KRE_HOME"
Set-Variable -Option Constant "UserHomeEnvVar" "KRE_USER_HOME" Set-Variable -Option Constant "UserHomeEnvVar" "KRE_USER_HOME"

8
build/kvm.sh
View File

@ -2,14 +2,14 @@
# Source this file from your .bash-profile or script to use # Source this file from your .bash-profile or script to use
# "Constants" # "Constants"
_KVM_BUILDNUMBER="10308" _KVM_BUILDNUMBER="10319"
_KVM_RUNTIME_PACKAGE_NAME="kre" _KVM_RUNTIME_PACKAGE_NAME="kre"
_KVM_RUNTIME_FRIENDLY_NAME="K Runtime" _KVM_RUNTIME_FRIENDLY_NAME="K Runtime"
_KVM_RUNTIME_SHORT_NAME="KRE" _KVM_RUNTIME_SHORT_NAME="KRE"
_KVM_RUNTIME_FOLDER_NAME=".k" _KVM_RUNTIME_FOLDER_NAME=".k"
_KVM_COMMAND_NAME="kvm" _KVM_COMMAND_NAME="kvm"
_KVM_VERSION_MANAGER_NAME="K Version Manager" _KVM_VERSION_MANAGER_NAME="K Version Manager"
_KVM_DEFAULT_FEED="https://www.myget.org/F/aspnetvnext/api/v2" _KVM_DEFAULT_FEED="https://www.myget.org/F/aspnetrelease/api/v2"
_KVM_HOME_VAR_NAME="KRE_HOME" _KVM_HOME_VAR_NAME="KRE_HOME"
__kvm_has() { __kvm_has() {
@ -22,14 +22,14 @@ if __kvm_has "unsetopt"; then
fi fi
if [ -z "$KVM_USER_HOME" ]; then if [ -z "$KVM_USER_HOME" ]; then
eval KVM_USER_HOME="~/$K_DIR_NAME" eval KVM_USER_HOME="~/$_KVM_RUNTIME_FOLDER_NAME"
fi fi
_KVM_USER_PACKAGES="$KVM_USER_HOME/runtimes" _KVM_USER_PACKAGES="$KVM_USER_HOME/runtimes"
_KVM_ALIAS_DIR="$KVM_USER_HOME/alias" _KVM_ALIAS_DIR="$KVM_USER_HOME/alias"
if [ -z "$KRE_FEED" ]; then if [ -z "$KRE_FEED" ]; then
KRE_FEED="https://www.myget.org/F/aspnetvnext/api/v2" KRE_FEED="$_KVM_DEFAULT_FEED"
fi fi
__kvm_find_latest() { __kvm_find_latest() {

5
makefile.shade
View File

@ -13,6 +13,7 @@ use import="BuildEnv"
functions functions
@{ @{
static string BUILD_BRANCH = Environment.GetEnvironmentVariable("BUILD_BRANCH") ?? "dev";
static string BASE_DIR = Directory.GetCurrentDirectory(); static string BASE_DIR = Directory.GetCurrentDirectory();
static string TARGET_DIR = Path.Combine(BASE_DIR, "artifacts", "build"); static string TARGET_DIR = Path.Combine(BASE_DIR, "artifacts", "build");
string[] repos = new[] { string[] repos = new[] {
@ -423,7 +424,7 @@ functions
if(Directory.Exists(repo)) if(Directory.Exists(repo))
{ {
GitPull(repoUrl, "dev", repo); GitPull(repoUrl, BUILD_BRANCH, repo);
} }
else else
{ {
@ -437,7 +438,7 @@ functions
try try
{ {
GitClone(repoUrl, "dev"); GitClone(repoUrl, BUILD_BRANCH);
} }
catch (Exception ex) catch (Exception ex)
{ {