Feature #574 win: Copy binaries to <build>/bin not /usr/bin 23/423/7
authorMichael Robson <mprobson@illinois.edu>
Wed, 5 Nov 2014 19:00:40 +0000 (13:00 -0600)
committerGerrit Code Review <gerrit2@charm.cs.uiuc.edu>
Thu, 6 Nov 2014 19:57:38 +0000 (13:57 -0600)
Change-Id: I0e383dbc7b5426bb4ebd1df80923845b5b320deb

build
src/arch/mpi-win32/conv-mach.sh
src/arch/mpi-win64/conv-mach.sh
src/arch/multicore-win32/conv-mach.sh
src/arch/multicore-win64/conv-mach.sh
src/arch/net-win32/conv-mach.sh
src/arch/net-win64/conv-mach.sh
src/arch/uth-win32/conv-mach.sh
src/scripts/configure
src/scripts/configure.in

diff --git a/build b/build
index 035ef8551bf682320ee2063a5022e2f10b98ad49..be9a8c7e96dabc2fb6da60f89edd1cb69843854a 100755 (executable)
--- a/build
+++ b/build
@@ -530,19 +530,21 @@ if [ "x_$WINNAME" = "x_win32" -o "x_$WINNAME" = "x_win64" ]
 then
 #Win32/64 version needs special compilers and *copied* (not linked)
 # source files.
-       echo "Copying compilers for $WINNAME into cygwin /bin directory"
-       cp -f $src/$WINNAME/unix2nt* /bin
+       [ -d $DESTINATION/bin ] || Echo "Creating dir: $DESTINATION/bin"
+       [ -d $DESTINATION/bin ] || mkdir $DESTINATION/bin
+       echo "Copying compilers for $WINNAME into $DESTINATION/bin directory"
+       cp -f $src/$WINNAME/unix2nt* $DESTINATION/bin
        cp $src/win32/system_ln $DESTINATION/tmp
        cp $src/win32/unistd.h $DESTINATION/tmp
        echo "Compiling createlink.cpp ..."
-        (cd $src/win32; unix2nt_cc  -c createlink.cpp -o createlink.o -D_WIN32_WINNT=0x0500; unix2nt_cc createlink.o)
+       (cd $src/win32; ../../../$DESTINATION/bin/unix2nt_cc  -c createlink.cpp -o createlink.o -D_WIN32_WINNT=0x0500; ../../../$DESTINATION/bin/unix2nt_cc createlink.o)
        if test ! -x $src/win32/createlink.exe
        then
                echo "VC++ is not properly installed!"
                exit 1
        fi
-       echo "Copying $src/win32/createlink.exe to /bin directory"
-       cp $src/win32/createlink.exe /bin
+       echo "Copying $src/win32/createlink.exe to $DESTINATION/bin directory"
+       cp $src/win32/createlink.exe $DESTINATION/bin
         chmod +x $DESTINATION/tmp/system_ln
        cp $src/win32/gathertree.local   $DESTINATION/tmp
        cp $src/win32/gatherflat.local   $DESTINATION/tmp
index d3e9cda4b442a8ea144e6feee64b1964689a472c..f8dd31f4da039379032e86c1d5afba3f803491f9 100644 (file)
@@ -1,10 +1,10 @@
 HPC_SDK="c:\Program Files\Microsoft MPI"
 HPC_SDK=`cygpath -d "$HPC_SDK"`
 
-CMK_CC="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE -I `cygpath -u "$HPC_SDK/Inc"`"
+CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE -I `cygpath -u "$HPC_SDK/Inc"`"
 CMK_CPP_CHARM="/usr/bin/cpp -P"
 CMK_CPP_C="$CMK_CC -E"
-CMK_CXX="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE  -I `cygpath -u "$HPC_SDK/Inc"`"
+CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE  -I `cygpath -u "$HPC_SDK/Inc"`"
 CMK_CXXPP=$CMK_CC
 CMK_LD="$CMK_CC -L`cygpath -u "$HPC_SDK/Lib/i386"` -lmsmpi"
 CMK_LDXX="$CMK_CXX -L`cygpath -u "$HPC_SDK/Lib/i386"` -lmsmpi"
@@ -16,7 +16,7 @@ CMK_SEQ_LDXX="$CMK_LDXX"
 
 CMK_CF77="f77"
 CMK_CF90="f90"
-CMK_AR="unix2nt_ar "
+CMK_AR="$CHARMBIN/unix2nt_ar "
 CMK_RANLIB="echo "
 CMK_LIBS=""
 CMK_XIOPTS=""
index fe46414a5a8042336bc0b8f40233d9a283245f60..b441509357eb02faf3588d7bc0b4ed62b3c9c394 100644 (file)
@@ -7,10 +7,10 @@ else
 fi
 HPC_SDK=`cygpath -d "$HPC_SDK"`
 
-CMK_CC="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE -I `cygpath -u "$HPC_SDK\Inc"`"
+CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE -I `cygpath -u "$HPC_SDK\Inc"`"
 CMK_CPP_CHARM="/usr/bin/cpp -P"
 CMK_CPP_C="$CMK_CC -E"
-CMK_CXX="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE  -I `cygpath -u "$HPC_SDK\Inc"`"
+CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE  -I `cygpath -u "$HPC_SDK\Inc"`"
 CMK_CXXPP=$CMK_CC
 CMK_LD="$CMK_CC -L `cygpath -u "$HPC_SDK\Lib\amd64"` -lmsmpi"
 CMK_LDXX="$CMK_CXX -L `cygpath -u "$HPC_SDK\Lib\amd64"` -lmsmpi"
@@ -22,7 +22,7 @@ CMK_SEQ_LDXX="$CMK_LDXX"
 
 CMK_CF77="f77"
 CMK_CF90="f90"
-CMK_AR="unix2nt_ar "
+CMK_AR="$CHARMBIN/unix2nt_ar "
 CMK_RANLIB="echo "
 CMK_LIBS=""
 CMK_XIOPTS=""
index 5651e607f91a1ad6090bcedd2cdacb74e27a9d62..38f3240034f390f1af90c5702efff40e83700caa 100644 (file)
@@ -1,7 +1,7 @@
-CMK_CC="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
 CMK_CPP_CHARM="/usr/bin/cpp -P"
 CMK_CPP_C="$CMK_CC -E"
-CMK_CXX="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
 CMK_CXXPP=$CMK_CC
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
@@ -13,7 +13,7 @@ CMK_SEQ_LDXX="$CMK_LDXX"
 
 CMK_CF77="f77"
 CMK_CF90="f90"
-CMK_AR="unix2nt_ar "
+CMK_AR="$CHARMBIN/unix2nt_ar "
 CMK_RANLIB="echo "
 CMK_LIBS=""
 CMK_XIOPTS=""
index 5651e607f91a1ad6090bcedd2cdacb74e27a9d62..38f3240034f390f1af90c5702efff40e83700caa 100644 (file)
@@ -1,7 +1,7 @@
-CMK_CC="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
 CMK_CPP_CHARM="/usr/bin/cpp -P"
 CMK_CPP_C="$CMK_CC -E"
-CMK_CXX="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
 CMK_CXXPP=$CMK_CC
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
@@ -13,7 +13,7 @@ CMK_SEQ_LDXX="$CMK_LDXX"
 
 CMK_CF77="f77"
 CMK_CF90="f90"
-CMK_AR="unix2nt_ar "
+CMK_AR="$CHARMBIN/unix2nt_ar "
 CMK_RANLIB="echo "
 CMK_LIBS=""
 CMK_XIOPTS=""
index a232f074d643f363ebde747e1bf74f130ed6b7ec..52d68f0f26de5624162a1308e84ee64aa78c3ddc 100644 (file)
@@ -1,7 +1,7 @@
 CMK_CPP_CHARM="/usr/bin/cpp -P"
-CMK_CC="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
 CMK_CPP_C="$CMK_CC -E"
-CMK_CXX="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
 CMK_CXXPP=$CMK_CC
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
@@ -13,7 +13,7 @@ CMK_SEQ_LDXX="$CMK_LDXX"
 
 CMK_CF77="f77"
 CMK_CF90="f90"
-CMK_AR="unix2nt_ar "
+CMK_AR="$CHARMBIN/unix2nt_ar "
 CMK_RANLIB="echo "
 CMK_LIBS=""
 CMK_XIOPTS=""
index 49b7a5f1ad8bdea46a34072b0e525475fe84f491..b086f69e8bb576c352589f194494d06e8b2bbf0f 100644 (file)
@@ -1,7 +1,7 @@
-CMK_CC="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
 CMK_CPP_C="$CMK_CC -E"
 CMK_CPP_CHARM="/usr/bin/cpp -P"
-CMK_CXX="unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
 CMK_CXXPP=$CMK_CC
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
@@ -13,7 +13,7 @@ CMK_SEQ_LDXX="$CMK_LDXX"
 
 CMK_CF77="f77"
 CMK_CF90="f90"
-CMK_AR="unix2nt_ar "
+CMK_AR="$CHARMBIN/unix2nt_ar "
 CMK_RANLIB="echo "
 CMK_LIBS=""
 CMK_XIOPTS=""
index 132207f46e96d0d6b6a1c9b6273d2abd3aaf029c..88e53c2f832bf00f5b31efa3dfc9ea07fa96b7fa 100644 (file)
@@ -1,9 +1,9 @@
-CMK_CC='unix2nt_cc '
+CMK_CC='$CHARMBIN/unix2nt_cc '
 CMK_CXX=$CMK_CC
 CMK_CXXPP=$CMK_CC
 CMK_CF77='f77'
 CMK_CF90='f90'
-CMK_AR='unix2nt_ar '
+CMK_AR='$CHARMBIN/unix2nt_ar '
 CMK_RANLIB='echo '
 CMK_LIBS=''
 CMK_XIOPTS=''
index ab5821572fac16a49406df7e43c2e94d6fe3e362..8374621fcace6d7da05676c379e5d0563cd58330 100755 (executable)
@@ -1694,6 +1694,7 @@ ac_config_commands="$ac_config_commands config-cleanup"
 
 
 CHARMINC="."
+CHARMBIN="../bin"
 test -r ./conv-config.sh && . ./conv-config.sh
 
 # Decimal representation of Charm++ release line and API revision
index 028156754a03d105625ecfe14f71ac2881d6c31c..dce6de0e5d8d505e9e56ce6f53452c9ee810b7ba 100644 (file)
@@ -7,6 +7,7 @@ AC_CONFIG_COMMANDS([config-cleanup],
                    [sed -i -e 's:^#define\s\+PACKAGE://&:' conv-autoconfig.h])
 
 CHARMINC="."
+CHARMBIN="../bin"
 test -r ./conv-config.sh && . ./conv-config.sh
 
 # Decimal representation of Charm++ release line and API revision