Fixing server build scripts which got broken after the staging direct…

…ory changes.
agarwal-kritika · Jul 19, 2017 · d8e2a83 · d8e2a83
1 parent cca1823
commit d8e2a83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/server/build-linux.sh b/server/build-linux.sh
@@ -512,9 +512,6 @@ EOT-PGADMIN
 
     touch $WD/server/staging_cache/linux/pgAdmin\ 4/venv/lib/python2.7/site-packages/backports/__init__.py || _die "Failed to tocuh the __init__.py"
 
-    echo "Preparing restructured staging for pgAdmin"
-#PARESH    cp -r "$WD/server/staging_cache/linux/pgAdmin 4" $PGADMIN_STAGING/ || _die "Failed to copy $WD/server/staging_cache/linux/pgAdmin\ 4"
-    cp -r "$WD/server/staging_cache/linux/pgAdmin 4" $PGADMIN_STAGING/
 
     echo "Removing last successful staging directory ($WD/server/staging/linux)"
     rm -rf $WD/server/staging/linux || _die "Couldn't remove the last successful staging directory"
@@ -531,6 +528,9 @@ EOT-PGADMIN
     echo "PG_MINOR_VERSION=$PG_MINOR_VERSION" >> $WD/server/staging/linux/versions-linux.sh
     echo "PG_PACKAGE_VERSION=$PG_PACKAGE_VERSION" >> $WD/server/staging/linux/versions-linux.sh
 
+    echo "Preparing restructured staging for pgAdmin"
+    cp -r "$WD/server/staging_cache/linux/pgAdmin 4" $PGADMIN_STAGING/
+
     echo "Preparing restructured staging for server"
     cp -r $WD/server/staging_cache/linux/bin $PGSERVER_STAGING  || _die "Failed to copy $WD/server/staging_cache/linux/bin"
     cp -r $WD/server/staging_cache/linux/lib $PGSERVER_STAGING  || _die "Failed to copy $WD/server/staging_cache/linux/lib"

diff --git a/server/build-windows-x64.sh b/server/build-windows-x64.sh
@@ -607,8 +607,8 @@ _postprocess_server_windows_x64() {
     unzip -o $WD/server/staging_cache/windows-x64/output.zip -d $WD/server/staging_cache/windows-x64/ || _die "Failed to unpack the built source tree ($WD/staging_cache/windows-x64/output.zip)"
     rm $WD/server/staging_cache/windows-x64/output.zip
 
-    dos2unix $WD/server/staging/windows-x64/versions-windows-x64.sh || _die "Failed to convert format of versions-windows-x64.sh from dos to unix"
-    source $WD/server/staging/windows-x64/versions-windows-x64.sh
+    dos2unix $WD/server/staging_cache/windows-x64/versions-windows-x64.sh || _die "Failed to convert format of versions-windows-x64.sh from dos to unix"
+    source $WD/server/staging_cache/windows-x64/versions-windows-x64.sh
     PG_BUILD_SERVER=$(expr $PG_BUILD_SERVER + $SKIPBUILD)
 
     scp $PG_SSH_WINDOWS:$PG_PGBUILD_WINDOWS/vcredist/vcredist_x86.exe $WD/server/staging_cache/windows-x64/installer || _die "Failed to copy the vcredist_x86.exe to windows-x64 staging_cache"