Merge branch 'master' of https://github.com/reedacartwright/spagedi

reedacartwright · May 2, 2013 · b848975 · b848975
2 parents fbebc23 + ecab3cf
commit b848975
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/releng/build-rel-unix.sh b/releng/build-rel-unix.sh
@@ -3,6 +3,8 @@
 
 CMAKE=cmake
 
+umask 077
+
 # Process command line arguments
 build_toolchain=
 while getopts t: name; do

diff --git a/releng/releng.cmake b/releng/releng.cmake
@@ -17,8 +17,21 @@ if(NOT RELENG_TAG)
 	set(RELENG_TAG "HEAD")
 endif()
 
+# Identify Temporary Directory
+if(WIN32 AND NOT UNIX)
+	set(TMPDIR $ENV{TEMP})
+	if(NOT TMPDIR)
+		set(TMPDIR "c:/Temp")
+	endif()
+else()
+	set(TMPDIR $ENV{TMPDIR})
+	if(NOT TMPDIR)
+		set(TMPDIR "/tmp")
+	endif()
+endif()
+
 string(RANDOM TMP)
-set(RELENG_DIR "${CMAKE_CURRENT_BINARY_DIR}/SPAGeDi-temp/${TMP}/")
+set(RELENG_DIR "${TMPDIR}/spagedi-releng-${TMP}/")
 
 message(STATUS "Using ${RELENG_DIR} to build packages ...")
 file(MAKE_DIRECTORY "${RELENG_DIR}")
@@ -67,8 +80,6 @@ else()
 	set(MAKE_BIN make)	
 endif()
 
-message(status "${CMAKE_DEFS}")
-
 if(RELENG_M32)
 	set(CMAKE_DEFS ${CMAKE_DEFS} -DCMAKE_C_FLAGS=-m32)
 endif()