Make whole of OTP build and release on Win64

Removed symbolic links from repository.

4 files changed, 79 insertions, 31 deletions

diff --git a/erts/etc/win32/nsis/Makefile b/erts/etc/win32/nsis/Makefile
index ae2343b420..6a93c5153d 100644
--- a/erts/etc/win32/nsis/Makefile
+++ b/erts/etc/win32/nsis/Makefile
@@ -40,10 +40,29 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 TARGET_DIR = $(RELEASE_PATH)
-WTESTROOT=$(shell (cygpath -d $(RELEASE_PATH) 2>/dev/null || cygpath -w $(RELEASE_PATH)))
-WTARGET_DIR=$(shell (cygpath -d $(TARGET_DIR) 2>/dev/null || cygpath -d $(TARGET_DIR)))
+
+ifeq ($(MSYSTEM),MINGW32)
+
+  MAKENSISFLAGS = //V2
+  WTESTROOT=$(shell (msys2win_path.sh $(RELEASE_PATH)))
+  WTARGET_DIR=$(shell (msys2win_path.sh $(TARGET_DIR)))
+
+else
+
+  MAKENSISFLAGS = /V2
+  WTESTROOT=$(shell (cygpath -d $(RELEASE_PATH) 2>/dev/null || cygpath -w $(RELEASE_PATH)))
+  WTARGET_DIR=$(shell (cygpath -d $(TARGET_DIR) 2>/dev/null || cygpath -d $(TARGET_DIR)))
+
+endif
+
+ifeq ($(CONFIG_SUBTYPE),win64)
+  WINTYPE=win64
+else
+  WINTYPE=win32
+endif
 
 REDIST_FILE=$(shell (sh ./find_redist.sh || echo ""))
+REDIST_TARGET=$(shell (sh ./find_redist.sh -n || echo ""))
 REDIST_DLL_VERSION=$(shell (sh ./dll_version_helper.sh || echo ""))
 REDIST_DLL_NAME=$(shell (sh ./dll_version_helper.sh -n || echo ""))
 
@@ -65,16 +84,18 @@ release_spec:
 	  echo '!define ERTS_VERSION "$(VSN)"' >> $(VERSION_HEADER);\
 	  echo '!define TESTROOT "$(WTESTROOT)"' >> $(VERSION_HEADER);\
 	  echo '!define OUTFILEDIR "$(WTARGET_DIR)"' >> $(VERSION_HEADER);\
+	  echo '!define WINTYPE "$(WINTYPE)"' >> $(VERSION_HEADER);\
 	  if [ -f $(CUSTOM_MODERN) ];\
 	  then \
 		echo '!define HAVE_CUSTOM_MODERN 1' >> $(VERSION_HEADER); \
 	  fi;\
 	  if [ '!' -z "$(REDIST_FILE)" -a '!' -z "$(REDIST_DLL_VERSION)" ];\
 	  then \
-		cp $(REDIST_FILE) $(RELEASE_PATH)/vcredist_x86.exe;\
+		cp $(REDIST_FILE) $(RELEASE_PATH)/$(REDIST_TARGET);\
 		echo '!define HAVE_REDIST_FILE 1'  >> $(VERSION_HEADER); \
 		echo '!define REDIST_DLL_VERSION "$(REDIST_DLL_VERSION)"' >> $(VERSION_HEADER);\
 		echo '!define REDIST_DLL_NAME "$(REDIST_DLL_NAME)"' >> $(VERSION_HEADER);\
+		echo '!define REDIST_EXECUTABLE "$(REDIST_TARGET)"' >> $(VERSION_HEADER);\
 	  fi;\
 	  if [ -f $(RELEASE_PATH)/docs/doc/index.html ];\
 	  then \
diff --git a/erts/etc/win32/nsis/dll_version_helper.sh b/erts/etc/win32/nsis/dll_version_helper.sh
index eecd4a72b5..96e4532b7a 100755
--- a/erts/etc/win32/nsis/dll_version_helper.sh
+++ b/erts/etc/win32/nsis/dll_version_helper.sh
@@ -36,11 +36,11 @@ int main(void)
 }
 
 EOF
-cl /MD hello.c  > /dev/null 2>&1
+cl -MD hello.c  > /dev/null 2>&1
 if [ '!' -f hello.exe.manifest ]; then
     # Gah - VC 2010 changes the way it handles DLL's and manifests... Again...
     # need another way of getting the version
-    DLLNAME=`dumpbin.exe /imports hello.exe | egrep MSVCR.*dll`
+    DLLNAME=`dumpbin.exe -imports hello.exe | egrep MSVCR.*dll`
     DLLNAME=`echo $DLLNAME`
     cat > helper.c <<EOF
 #include <windows.h>
@@ -59,11 +59,7 @@ int main(void)
   char *vs_verinfo;
   unsigned int vs_ver_size;
   
-  struct LANGANDCODEPAGE {
-    WORD language;
-    WORD codepage;
-  } *translate;
-
+  WORD *translate;
   unsigned int tr_size;
   
   if (!(versize = GetFileVersionInfoSize(REQ_MODULE,&dummy))) {
@@ -79,10 +75,10 @@ int main(void)
     fprintf(stderr,"No translation info in %s!\n",REQ_MODULE);
     exit(3);
   }
-  n = tr_size/sizeof(translate);
+  n = tr_size/(2*sizeof(*translate));
   for(i=0; i < n; ++i) {
     sprintf(buff,"\\\\StringFileInfo\\\\%04x%04x\\\\FileVersion",
-	    translate[i].language,translate[i].codepage);
+	    translate[i*2],translate[i*2+1]);
     if (VerQueryValue(versinfo,buff,&vs_verinfo,&vs_ver_size)) {
       printf("%s\n",(char *) vs_verinfo);
       return 0;
@@ -92,7 +88,7 @@ int main(void)
   return 0;
 }
 EOF
-    cl /MD helper.c version.lib > /dev/null 2>&1
+    cl -MD helper.c version.lib > /dev/null 2>&1
     if [ '!' -f helper.exe ]; then
 	echo "Failed to build helper program." >&2
 	exit 1
diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi
index 941e8e6f5d..fb0eff3867 100644
--- a/erts/etc/win32/nsis/erlang20.nsi
+++ b/erts/etc/win32/nsis/erlang20.nsi
@@ -31,17 +31,24 @@ Var STARTMENU_FOLDER
 !define MY_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"

 

 ;General

-	OutFile "${OUTFILEDIR}\otp_win32_${OTP_VERSION}.exe"

+	OutFile "${OUTFILEDIR}\otp_${WINTYPE}_${OTP_VERSION}.exe"

 

 ;Folder selection page

+!if ${WINTYPE} == "win64"

+  	InstallDir "$PROGRAMFILES64\erl${ERTS_VERSION}"

+!else

   	InstallDir "$PROGRAMFILES\erl${ERTS_VERSION}"

-  

+!endif  

 ;Remember install folder

   	InstallDirRegKey HKLM "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}" ""

   

 ; Set the default start menu folder

 

+!if ${WINTYPE} == "win64"

+	!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${OTP_PRODUCT} ${OTP_VERSION} (x64)"

+!else

 	!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${OTP_PRODUCT} ${OTP_VERSION}"

+!endif  

 

 ;--------------------------------

 ;Modern UI Configuration

@@ -98,12 +105,12 @@ Var STARTMENU_FOLDER
 Section "Microsoft redistributable libraries." SecMSRedist

 

   	SetOutPath "$INSTDIR"

-	File "${TESTROOT}\vcredist_x86.exe"

+	File "${TESTROOT}\${REDIST_EXECUTABLE}"

   

 ; Set back verbosity...

   	!verbose 1

 ; Run the setup program  

-  	ExecWait '"$INSTDIR\vcredist_x86.exe"'

+  	ExecWait '"$INSTDIR\${REDIST_EXECUTABLE}"'

 

   	!verbose 1

 SectionEnd ; MSRedist

diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh
index bc4260ecba..7c449c9e4e 100755
--- a/erts/etc/win32/nsis/find_redist.sh
+++ b/erts/etc/win32/nsis/find_redist.sh
@@ -65,7 +65,6 @@ remove_path_element()
     else
 	echo "${ACC}/$1"
     fi
-
     #echo "ACC=$ACC" >&2
     #echo "1=$1" >&2
 }
@@ -89,20 +88,39 @@ add_path_element()
     echo "$PA"
 }
 
+
 CLPATH=`lookup_prog_in_path cl`
 
 if [ -z "$CLPATH" ]; then 
-    echo "Can not locate cl.exe and vcredist_x86.exe - OK if using mingw" >&2
+    echo "Can not locate cl.exe and vcredist_x86/x64.exe - OK if using mingw" >&2
     exit 1
 fi
 
-#echo $CLPATH
+# Look to see if it's 64bit
+XX=`remove_path_element cl "$CLPATH"`
+YY=`remove_path_element amd64 "$XX"`
+if [ "$YY" != "$XX" ]; then
+    AMD64DIR=true
+    VCREDIST=vcredist_x64
+    COMPONENTS="cl amd64 bin vc"
+else
+    AMD64DIR=false
+    VCREDIST=vcredist_x86
+    COMPONENTS="cl bin vc"
+fi
+
+if [ X"$1" = X"-n" ]; then
+    echo $VCREDIST.exe
+    exit 0
+fi
+
+# echo $CLPATH
 BPATH=$CLPATH
-for x in cl bin vc; do
-    #echo $x
+for x in $COMPONENTS; do
+    # echo $x
     NBPATH=`remove_path_element $x "$BPATH"`
     if [ "$NBPATH" = "$BPATH" ]; then
-	echo "Failed to locate vcredist_x86.exe because cl.exe was in an unexpected location" >&2
+	echo "Failed to locate $VCREDIST.exe because cl.exe was in an unexpected location" >&2
 	exit 2
     fi
     BPATH="$NBPATH"
@@ -115,7 +133,12 @@ fail=false
 if [ '!' -z "$RCPATH" ]; then 
     BPATH=$RCPATH
     allow_fail=false
-    for x in rc bin @ANY v6.0A v7.0A v7.1; do
+    if [ $AMD64DIR = true ]; then
+	COMPONENTS="rc x64 bin @ANY v6.0A v7.0A v7.1"
+    else
+	COMPONENTS="rc bin @ANY v6.0A v7.0A v7.1"
+    fi
+    for x in $COMPONENTS; do
 	if [ $x = @ANY ]; then
 	    allow_fail=true
 	else
@@ -131,6 +154,7 @@ if [ '!' -z "$RCPATH" ]; then
 	BPATH_LIST="$BPATH_LIST $BPATH"
     fi
 fi
+# echo "BPATH_LIST=$BPATH_LIST"
 
 # Frantic search through two roots with different 
 # version directories. We want to be very specific about the
@@ -143,7 +167,7 @@ for BP in $BPATH_LIST; do
 	BPATH=$BP
 	fail=false
 	allow_fail=false
-	for x in $verdir @ANY bootstrapper packages vcredist_x86 Redist VC @ALL vcredist_x86.exe; do
+	for x in $verdir @ANY bootstrapper packages $VCREDIST Redist VC @ALL $VCREDIST.exe; do
 	    #echo "x=$x"
 	    #echo "BPATH=$BPATH"
 	    #echo "allow_fail=$allow_fail"
@@ -170,18 +194,18 @@ for BP in $BPATH_LIST; do
     fi
 done
 
-# shortcut for locating vcredist_x86.exe is to put it into $ERL_TOP
-if [ -f $ERL_TOP/vcredist_x86.exe ]; then
-    echo $ERL_TOP/vcredist_x86.exe
+# shortcut for locating $VCREDIST.exe is to put it into $ERL_TOP
+if [ -f $ERL_TOP/$VCREDIST.exe ]; then
+    echo $ERL_TOP/$VCREDIST.exe
     exit 0
 fi
 
 # or $ERL_TOP/.. to share across multiple builds
-if [ -f $ERL_TOP/../vcredist_x86.exe ]; then
-    echo $ERL_TOP/../vcredist_x86.exe
+if [ -f $ERL_TOP/../$VCREDIST.exe ]; then
+    echo $ERL_TOP/../$VCREDIST.exe
     exit 0
 fi
 
-echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2
+echo "Failed to locate $VCREDIST.exe because directory structure was unexpected" >&2
 exit 3