psqlodbc.git / summary / log / commit / refs

commit    818d4f692c8fc3753c81f736edf0ec842c5f0785
Author:   Hiroshi Inoue <inoue@tpf.co.jp>
Date:     Fri Nov 22 07:15:56 2013 +0000

    Make it possible to invoke several scripts from any working directory.


 buildx64.ps1                     |  5 ++++-
 buildx86.ps1                     |  5 ++++-
 installer/buildX64-installer.ps1 |  9 +++++++--
 installer/buildX86-installer.ps1 | 10 ++++++++--
 winbuild/editConfiguration.ps1   |  3 ++-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/buildx64.ps1 b/buildx64.ps1
index d2f7540..25a7006 100644
--- a/buildx64.ps1
+++ b/buildx64.ps1
@@ -3,8 +3,10 @@ Param(
 [string]$target="ALL",
 [string]$configPath
 )
-$configInfo = & ".\winbuild\configuration.ps1" "$configPath"
+$scriptPath = (Split-Path $MyInvocation.MyCommand.Path)
+$configInfo = & "$scriptPath\winbuild\configuration.ps1" "$configPath"
 $x64info = $configInfo.Configuration.x64
+pushd $scriptPath
 if ($x64info.setvcvars -ne "") {
 	$envcmd = [String] $x64info.setvcvars
 	Write-Host "setvcvars :" $envcmd
@@ -48,3 +50,4 @@ Write-Host "SSL DIR    : ($SSL_INC $SSL_LIB)"
 $MACROS = "USE_LIBPQ=$USE_LIBPQ USE_SSPI=$USE_SSPI USE_GSS=$USE_GSS PG_LIB=`"$PG_LIB`" PG_INC=`"$PG_INC`" SSL_LIB=`"$SSL_LIB`" SSL_INC=`"$SSL_INC`" GSS_LIB=`"$GSS_LIB`" GSS_INC=`"$GSS_INC`" $BUILD_MACROS"
 invoke-expression "nmake.exe /f win64.mak $MACROS $target"
 invoke-expression "nmake.exe /f win64.mak ANSI_VERSION=yes $MACROS $target"
+popd
diff --git a/buildx86.ps1 b/buildx86.ps1
index 51300ae..a75eb72 100755
--- a/buildx86.ps1
+++ b/buildx86.ps1
@@ -3,8 +3,10 @@ Param(
 [string]$target="ALL",
 [string]$configPath
 )
-$configInfo = & ".\winbuild\configuration.ps1" "$configPath"
+$scriptPath = (Split-Path $MyInvocation.MyCommand.Path)
+$configInfo = & "$scriptPath\winbuild\configuration.ps1" "$configPath"
 $x86info = $configInfo.Configuration.x86
+pushd $scriptPath
 if ($x86info.setvcvars -ne "") {
 	$envcmd = [String] $x86info.setvcvars
 	Write-Host "setvcvars :" $envcmd
@@ -42,3 +44,4 @@ Write-Host "SSL	   : ($SSL_INC $SSL_LIB)"
 $MACROS = "USE_LIBPQ=$USE_LIBPQ USE_SSPI=$USE_SSPI PG_LIB=`"$PG_LIB`" PG_INC=`"$PG_INC`" SSL_LIB=`"$SSL_LIB`" SSL_INC=`"$SSL_INC`" $BUILD_MACROS"
 invoke-expression "nmake.exe /f win32.mak $MACROS $target"
 invoke-expression "nmake.exe /f win32.mak ANSI_VERSION=yes $MACROS $target"
+popd
diff --git a/installer/buildX64-installer.ps1 b/installer/buildX64-installer.ps1
index 170b25b..a969916 100755
--- a/installer/buildX64-installer.ps1
+++ b/installer/buildX64-installer.ps1
@@ -2,7 +2,8 @@
 Param(
 [string]$configPath
 )
-$configInfo = & "..\winbuild\configuration.ps1" "$configPath"
+$scriptPath = (Split-Path $MyInvocation.MyCommand.Path)
+$configInfo = & "$scriptPath\..\winbuild\configuration.ps1" "$configPath"
 $VERSION = $configInfo.Configuration.version
 $x64info = $configInfo.Configuration.x64
 $USE_LIBPQ=$x64info.use_libpq
@@ -62,6 +63,8 @@ if ("$PRODUCTCODE" -eq "") {
 Write-Host "PRODUCTCODE: $PRODUCTCODE"
 
 try {
+	pushd $scriptPath
+
 	Write-Host ".`nBuilding psqlODBC/$SUBLOC merge module..."
 
 	invoke-expression "candle -nologo -dPlatform=$CPUTYPE `"-dVERSION=$VERSION`" -dSUBLOC=$SUBLOC `"-dLIBPQBINDIR=$LIBPQBINDIR`" `"-dGSSBINDIR=$GSSBINDIR`" -o $CPUTYPE\psqlodbcm.wixobj psqlodbcm_cpu.wxs"
@@ -82,7 +85,9 @@ try {
 	Write-Host ".`nDone!"
 }
 catch {
-
 	Write-Host ".`Aborting build!"
 	throw $error[0]
 }
+finally {
+	popd
+}
diff --git a/installer/buildX86-installer.ps1 b/installer/buildX86-installer.ps1
index 482d978..c403ada 100755
--- a/installer/buildX86-installer.ps1
+++ b/installer/buildX86-installer.ps1
@@ -2,7 +2,8 @@
 Param(
 [string]$configPath
 )
-$configInfo = & "..\winbuild\configuration.ps1" "$configPath"
+$scriptPath = (Split-Path $MyInvocation.MyCommand.Path)
+$configInfo = & "$scriptPath\..\winbuild\configuration.ps1" "$configPath"
 $VERSION = $configInfo.Configuration.version
 $x86info = $configInfo.Configuration.x86
 $USE_LIBPQ=$x86info.use_libpq
@@ -55,6 +56,8 @@ if ("$PRODUCTCODE" -eq "") {
 Write-Host "PRODUCTCODE: $PRODUCTCODE"
 
 try {
+	pushd $scroptPath
+
 	Write-Host ".`nBuilding psqlODBC/$SUBLOC merge module..."
 
 	invoke-expression "candle -nologo `"-dVERSION=$VERSION`" -dSUBLOC=$SUBLOC `"-dLINKFILES=$LIBPQBINDIR`" psqlodbcm.wxs"
@@ -71,5 +74,8 @@ try {
 }
 catch {
 	Write-Host ".`nAborting build!"
-	throw $error[0] 
+	throw $error[0]
+}
+finally {
+	popd
 }
diff --git a/winbuild/editConfiguration.ps1 b/winbuild/editConfiguration.ps1
index 2542971..d07167c 100755
--- a/winbuild/editConfiguration.ps1
+++ b/winbuild/editConfiguration.ps1
@@ -185,7 +185,8 @@ for ($i = 1; $i -lt 17; $i++)
     $button.add_Click($button_click)
 }
 
-$configInfo = & ".\configuration.ps1" "$configPath"
+$scriptPath = (Split-Path $MyInvocation.MyCommand.Path)
+$configInfo = & "$scriptPath\configuration.ps1" "$configPath"
 
 $window.findName("versionBox").Text = $configInfo.Configuration.version
 


[parent: 7c14f8dfbf2f]