Switching to clang

HostedDinner · Oct 11, 2017 · 6715e2e · 6715e2e
1 parent c8a479f
commit 6715e2e
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 30 deletions.
diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk
@@ -14,14 +14,14 @@ GREP=grep
 NM=nm
 CCADMIN=CCadmin
 RANLIB=ranlib
-CC=gcc
-CCC=g++
-CXX=g++
+CC=clang
+CCC=clang++
+CXX=clang++
 FC=gfortran
 AS=as
 
 # Macros
-CND_PLATFORM=MinGW-Windows
+CND_PLATFORM=CLang-Windows
 CND_DLIB_EXT=dll
 CND_CONF=Debug
 CND_DISTDIR=dist
@@ -70,7 +70,7 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe: ${CND_BUILDDIR}/$
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter ${OBJECTFILES} ${LDLIBSOPTIONS}
+	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/src/ConfigParser.o: src/ConfigParser.cpp
 	${MKDIR} -p ${OBJECTDIR}/src

diff --git a/nbproject/Makefile-Release.mk b/nbproject/Makefile-Release.mk
@@ -14,14 +14,14 @@ GREP=grep
 NM=nm
 CCADMIN=CCadmin
 RANLIB=ranlib
-CC=gcc
-CCC=g++
-CXX=g++
+CC=clang
+CCC=clang++
+CXX=clang++
 FC=gfortran
 AS=as
 
 # Macros
-CND_PLATFORM=MinGW-Windows
+CND_PLATFORM=CLang-Windows
 CND_DLIB_EXT=dll
 CND_CONF=Release
 CND_DISTDIR=dist
@@ -70,7 +70,7 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe: ${CND_BUILDDIR}/$
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter ${OBJECTFILES} ${LDLIBSOPTIONS}
+	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/src/ConfigParser.o: src/ConfigParser.cpp
 	${MKDIR} -p ${OBJECTDIR}/src

diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk
@@ -7,21 +7,21 @@ CND_BASEDIR=`pwd`
 CND_BUILDDIR=build
 CND_DISTDIR=dist
 # Debug configuration
-CND_PLATFORM_Debug=MinGW-Windows
-CND_ARTIFACT_DIR_Debug=dist/Debug/MinGW-Windows
-CND_ARTIFACT_NAME_Debug=servicestarter
-CND_ARTIFACT_PATH_Debug=dist/Debug/MinGW-Windows/servicestarter
-CND_PACKAGE_DIR_Debug=dist/Debug/MinGW-Windows/package
+CND_PLATFORM_Debug=CLang-Windows
+CND_ARTIFACT_DIR_Debug=dist/Debug/CLang-Windows
+CND_ARTIFACT_NAME_Debug=servicestarter.exe
+CND_ARTIFACT_PATH_Debug=dist/Debug/CLang-Windows/servicestarter.exe
+CND_PACKAGE_DIR_Debug=dist/Debug/CLang-Windows/package
 CND_PACKAGE_NAME_Debug=servicestarter.zip
-CND_PACKAGE_PATH_Debug=dist/Debug/MinGW-Windows/package/servicestarter.zip
+CND_PACKAGE_PATH_Debug=dist/Debug/CLang-Windows/package/servicestarter.zip
 # Release configuration
-CND_PLATFORM_Release=MinGW-Windows
-CND_ARTIFACT_DIR_Release=dist/Release/MinGW-Windows
-CND_ARTIFACT_NAME_Release=servicestarter
-CND_ARTIFACT_PATH_Release=dist/Release/MinGW-Windows/servicestarter
-CND_PACKAGE_DIR_Release=dist/Release/MinGW-Windows/package
+CND_PLATFORM_Release=CLang-Windows
+CND_ARTIFACT_DIR_Release=dist/Release/CLang-Windows
+CND_ARTIFACT_NAME_Release=servicestarter.exe
+CND_ARTIFACT_PATH_Release=dist/Release/CLang-Windows/servicestarter.exe
+CND_PACKAGE_DIR_Release=dist/Release/CLang-Windows/package
 CND_PACKAGE_NAME_Release=servicestarter.zip
-CND_PACKAGE_PATH_Release=dist/Release/MinGW-Windows/package/servicestarter.zip
+CND_PACKAGE_PATH_Release=dist/Release/CLang-Windows/package/servicestarter.zip
 #
 # include compiler specific variables
 #

diff --git a/nbproject/Package-Debug.bash b/nbproject/Package-Debug.bash
@@ -6,15 +6,15 @@
 
 # Macros
 TOP=`pwd`
-CND_PLATFORM=MinGW-Windows
+CND_PLATFORM=CLang-Windows
 CND_CONF=Debug
 CND_DISTDIR=dist
 CND_BUILDDIR=build
 CND_DLIB_EXT=dll
 NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter
-OUTPUT_BASENAME=servicestarter
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe
+OUTPUT_BASENAME=servicestarter.exe
 PACKAGE_TOP_DIR=servicestarter/
 
 # Functions
@@ -71,6 +71,10 @@ cd "${TOP}"
 makeDirectory "${NBTMPDIR}/servicestarter/bin"
 copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
 
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/servicestarter/bin"
+copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
+
 
 # Generate zip file
 cd "${TOP}"

diff --git a/nbproject/Package-Release.bash b/nbproject/Package-Release.bash
@@ -6,15 +6,15 @@
 
 # Macros
 TOP=`pwd`
-CND_PLATFORM=MinGW-Windows
+CND_PLATFORM=CLang-Windows
 CND_CONF=Release
 CND_DISTDIR=dist
 CND_BUILDDIR=build
 CND_DLIB_EXT=dll
 NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter
-OUTPUT_BASENAME=servicestarter
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe
+OUTPUT_BASENAME=servicestarter.exe
 PACKAGE_TOP_DIR=servicestarter/
 
 # Functions
@@ -71,6 +71,10 @@ cd "${TOP}"
 makeDirectory "${NBTMPDIR}/servicestarter/bin"
 copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
 
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/servicestarter/bin"
+copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
+
 
 # Generate zip file
 cd "${TOP}"

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
@@ -91,7 +91,7 @@
           <warningLevel>2</warningLevel>
         </ccTool>
         <linkerTool>
-          <output>${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter</output>
+          <output>${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe</output>
           <additionalDep>${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/resource.o</additionalDep>
           <linkerLibItems>
             <linkerOptionItem>${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/resource.o</linkerOptionItem>
@@ -221,7 +221,7 @@
           <developmentMode>5</developmentMode>
         </asmTool>
         <linkerTool>
-          <output>${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter</output>
+          <output>${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/servicestarter.exe</output>
           <additionalDep>${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/resource.o</additionalDep>
           <linkerLibItems>
             <linkerOptionItem>${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/resource.o</linkerOptionItem>
@@ -231,6 +231,8 @@
       </compileType>
       <packaging>
         <packType>Zip</packType>
+        <output>${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/servicestarter.zip</output>
+        <commandlineTool>zip</commandlineTool>
         <packFileList>
           <packFileListElem type="File"
                             to="${PACKAGE_TOP_DIR}bin/config.xml"