Browse Source

Merge pull request #434 from rwindelz/master

fix (scripts/release-version.ps1): fix windows build
Brandon Philips 12 years ago
parent
commit
5260c7c939
2 changed files with 4 additions and 3 deletions
  1. 2 1
      build.ps1
  2. 2 2
      scripts/release-version.ps1

+ 2 - 1
build.ps1

@@ -4,6 +4,7 @@ $env:GOPATH=$pwd.Path
 $SRC_DIR="$env:GOPATH/src"
 $ETCD_DIR="$SRC_DIR/$ETCD_PACKAGE"
 $env:ETCD_DIR="$SRC_DIR/$ETCD_PACKAGE"
+$env:ETCD_TARGET=$pwd.Path
 
 $ETCD_BASE=(Split-Path $ETCD_DIR -Parent)
 if(-not(test-path $ETCD_DIR)){
@@ -11,7 +12,7 @@ if(-not(test-path $ETCD_DIR)){
 }
 
 if(-not(test-path $ETCD_DIR )){
-	cmd /c 'mklink /D "%ETCD_DIR%" ..\..\..\'
+	cmd /c 'mklink /J "%ETCD_DIR%" %ETCD_TARGET%'
 }
 
 foreach($i in (ls third_party/*)){

+ 2 - 2
scripts/release-version.ps1

@@ -2,6 +2,6 @@
 $VER=(git describe --tags HEAD)
 
 @"
-package main
-const releaseVersion = "$VER"
+package server
+const ReleaseVersion = "$VER"
 "@