Changeset 11532

Timestamp:

02/24/12 13:25:48 (14 years ago)

Author:

Eric.Larour

Message:

Moved win7 to more general windows configuration files for windows compilers.
Introduced setup of windows compilers at the /etc/environment.sh level.

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/win7/notes (deleted)
• externalpackages/win7/sdk7.1.32bits.sh (deleted)
• externalpackages/win7/sdk7.1.64bits.sh (deleted)
• externalpackages/win7/vs10.0.sh (deleted)
• externalpackages/win7/winsdk_web.exe (deleted)
• externalpackages/windows (moved) (moved from issm/trunk-jpl/externalpackages/win7 )
• externalpackages/windows/README (copied) (copied from issm/trunk-jpl/externalpackages/win7/README )
• externalpackages/windows/configs (copied) (copied from issm/trunk-jpl/externalpackages/win7/configs )
• externalpackages/windows/win7.sdk7.1.exe (copied) (copied from issm/trunk-jpl/externalpackages/win7/win7.sdk7.1.exe )
• externalpackages/windows/windows_environment.sh (copied) (copied from issm/trunk-jpl/externalpackages/win7/windows_environment.sh ) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -8 +8 @@
         eval $i
 done
+
+#Windows compilers: 
+if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then
+        source $ISSM_TIER/externalpackages/windows/windows_environment.sh
+fi
+
 
 #CRON utilities

issm/trunk-jpl/externalpackages/windows/windows_environment.sh

@@ -2 +2 @@
 
 #Where are the configuration files for each compiler: 
-config_dir="$ISSM_TIER/externalpackages/win7/configs"
+config_dir="$ISSM_TIER/externalpackages/windows/configs"
 
 #your choise of compiler: