comparison test/jprt.config @ 4404:b601102d00c8

Merge
author hseigel
date Wed, 27 Mar 2013 13:26:44 -0700
parents c18cbe5936b8
children
comparison
equal deleted inserted replaced
1:0c624801d983 2:3e30835d9342
73 # Check input 73 # Check input
74 dirMustExist "${slashjava}" ALT_SLASH_JAVA 74 dirMustExist "${slashjava}" ALT_SLASH_JAVA
75 75
76 # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. 76 # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
77 osname=`uname -s` 77 osname=`uname -s`
78 if [ "${osname}" = SunOS ] ; then 78 case "${osname}" in
79 79 SunOS )
80 # SOLARIS: Sparc or X86 80 # SOLARIS: Sparc or X86
81 osarch=`uname -p` 81 osarch=`uname -p`
82 if [ "${osarch}" = sparc ] ; then 82 if [ "${osarch}" = sparc ] ; then
83 solaris_arch=sparc 83 solaris_arch=sparc
84 else 84 else
98 fi 98 fi
99 fileMustExist "${make}" make 99 fileMustExist "${make}" make
100 100
101 # File creation mask 101 # File creation mask
102 umask 002 102 umask 002
103 ;;
103 104
104 elif [ "${osname}" = Linux ] ; then 105 Linux | Darwin )
105
106 # Add basic paths 106 # Add basic paths
107 path4sdk=/usr/bin:/bin:/usr/sbin:/sbin 107 path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
108 108
109 # Find GNU make 109 # Find GNU make
110 make=/usr/bin/make 110 make=/usr/bin/make
111 fileMustExist "${make}" make 111 fileMustExist "${make}" make
112 112
113 umask 002 113 umask 002
114 ;;
114 115
115 else 116 FreeBSD | OpenBSD )
117 # Add basic paths
118 path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
116 119
120 # Find GNU make
121 make=/usr/local/bin/gmake
122 fileMustExist "${make}" make
123
124 umask 002
125 ;;
126
127 NetBSD )
128 # Add basic paths
129 path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
130
131 # Find GNU make
132 make=/usr/pkg/bin/gmake
133 fileMustExist "${make}" make
134
135 umask 002
136 ;;
137
138 * )
117 # Windows: Differs on CYGWIN vs. MKS. 139 # Windows: Differs on CYGWIN vs. MKS.
118 140
119 # We need to determine if we are running a CYGWIN shell or an MKS shell 141 # We need to determine if we are running a CYGWIN shell or an MKS shell
120 # (if uname isn't available, then it will be unix_toolset=unknown) 142 # (if uname isn't available, then it will be unix_toolset=unknown)
121 unix_toolset=unknown 143 unix_toolset=unknown
152 174
153 # Convert path4sdk to cygwin style 175 # Convert path4sdk to cygwin style
154 if [ "${unix_toolset}" = CYGWIN ] ; then 176 if [ "${unix_toolset}" = CYGWIN ] ; then
155 path4sdk="`/usr/bin/cygpath -p ${path4sdk}`" 177 path4sdk="`/usr/bin/cygpath -p ${path4sdk}`"
156 fi 178 fi
157 179 ;;
158 fi 180 esac
159 181
160 # Export PATH setting 182 # Export PATH setting
161 PATH="${path4sdk}" 183 PATH="${path4sdk}"
162 export PATH 184 export PATH
163 185