build processes (particularly for windows) updated

ecoforecastVT · Jul 14, 2022 · b503a14 · b503a14
1 parent 82af50e
commit b503a14
Show file tree

Hide file tree

Showing 18 changed files with 55 additions and 40 deletions.
diff --git a/Makefile b/Makefile
@@ -97,13 +97,13 @@ ifeq ($(OSTYPE),Darwin)
  SHARED=-dynamiclib -undefined dynamic_lookup
  so_ext=dylib
 else ifeq ($(OSTYPE),Msys)
- CINCLUDES+=-I../win-3rd-party/x64-Release/include
- LIBS+=-L../win-3rd-party/x64-Release/lib
+ CINCLUDES+=-I../ancillary/windows/msys/include
+ LIBS+=-L../ancillary/windows/msys/lib
 else ifeq ($(OSTYPE),FreeBSD)
- FINCLUDES+=-I../flang_extra/mod
+ FINCLUDES+=-I../ancillary/freebsd/mod
  FINCLUDES+=-I/usr/local/include
  CINCLUDES+=-I/usr/local/include
- LIBS+=-L../flang_extra/ -lflang_extra -L/usr/local/lib
+ LIBS+=-L../ancillary/freebsd/lib -lflang_extra -L/usr/local/lib
 else
  CINCLUDES+=-I/usr/local/include
  EXTRALINKFLAGS=-Wl,--export-dynamic

diff --git a/build_glm.sh b/build_glm.sh
@@ -212,9 +212,9 @@ cd ${UTILDIR}
 ${MAKE} || exit 1
 
 cd ${CURDIR}/..
-if [ "$FC" = "flang" -a -d flang_extra ] ; then
+if [ "$OSTYPE" = "FreeBSD" -a -d ancillary/freebsd ] ; then
  echo making flang extras
- cd flang_extra
+ cd ancillary/freebsd
  ${MAKE} || exit 1
 fi
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-glm (3.3.0a8-0) UNRELEASED; urgency=low
+glm (3.3.0a9-0) UNRELEASED; urgency=low
 
  * new version 3.2.0a1
  * new version 3.2.0a8
@@ -9,8 +9,9 @@ glm (3.3.0a8-0) UNRELEASED; urgency=low
  * new version 3.3.0a6
  * new version 3.3.0a7
  * new version 3.3.0a8
+ * new version 3.3.0a9
 
- -- Casper Boon <casper@shark> Tue, 21 Jun 2022 11:39:54 +0800
+ -- Casper Boon <casper@shark> Thu, 14 Jul 2022 12:35:04 +0800
 
 glm (3.1.0-0) UNRELEASED; urgency=low
 

diff --git a/debian/rules b/debian/rules
@@ -2,7 +2,7 @@
 
 package=glm
 year=2021
-version=3.3.0a8
+version=3.3.0a9
 release=0.0
 
 #export DH_VERBOSE=1

diff --git a/freebsd/create_pkg.sh b/freebsd/create_pkg.sh
@@ -35,7 +35,7 @@ EOF
 
 cat >> ${STAGEDIR}/+MANIFEST <<EOF
 name: ${PKGNAME}
-version: "3.3.0a5"
+version: "3.3.0a8"
 origin: science/${PKGNAME}
 comment: "automates stuff"
 desc: "automates tasks which can also be undone later"

diff --git a/src/glm.h b/src/glm.h
@@ -35,7 +35,7 @@
 #endif
 #define USE_FILLVALUE 1
 
-#define GLM_VERSION "3.3.0a8"
+#define GLM_VERSION "3.3.0a9"
 
 #define POINT 0
 #define Z_SHAPE 1

diff --git a/vers.sh b/vers.sh
@@ -32,26 +32,26 @@ if [ "$N4" = "" ] ; then
 fi
 OPV=$N1\,$N2\,$N3\,$N4
 
-# echo vers = $vers - OPV = $OPV
+ echo vers = $vers - OPV = $OPV
 
 for FILE in ./glm.rc ./glm+.rc ; do
  OFV=`grep FILEVERSION ${FILE} | sed 's/^[ \t]*//' | cut -f2 -d\ `
-# echo OFV = $OFV - OPV = $OPV
+ echo OFV = $OFV - OPV = $OPV
 
  if [ "$OPV" != "$OFV" ] ; then # new version number
- echo /usr/bin/sed -e "s/${OFV}/${OPV}/" -i${EXTN} ${FILE}
- /usr/bin/sed -e "s/${OFV}/${OPV}/" -i${EXTN} ${FILE}
+ echo sed -e "s/${OFV}/${OPV}/" -i${EXTN} ${FILE}
+ sed -e "s/${OFV}/${OPV}/" -i${EXTN} ${FILE}
 
  if [ "${OSTYPE}" = "Darwin" ] || [ "${OSTYPE}" = "FreeBSD" ] ; then
  /bin/rm ${FILE}${EXTN}
  fi
 
  OFV=`grep FileVersion ${FILE} | sed 's/^[ \t]*//' | cut -f3 -d\ | tr -d '\"'`
-# echo OFV2 = \'$OFV\' - vers = \'$vers\'
+ echo OFV2 = \'$OFV\' - vers = \'$vers\'
 
  if [ "$vers" != "$OFV" ] ; then # new version number
- echo /usr/bin/sed -e "s/${OFV}/${vers}/" -i${EXTN} ${FILE}
- /usr/bin/sed -e "s/${OFV}/${vers}/" -i${EXTN} ${FILE}
+ echo sed -e "s/${OFV}/${vers}/" -i${EXTN} ${FILE}
+ sed -e "s/${OFV}/${vers}/" -i${EXTN} ${FILE}
 
  if [ "${OSTYPE}" = "Darwin" ] || [ "${OSTYPE}" = "FreeBSD" ] ; then
  /bin/rm ${FILE}${EXTN}

diff --git a/win/glm+.rc b/win/glm+.rc
@@ -27,8 +27,8 @@ END
 
 //==============================================================================
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,0,0xa7
- PRODUCTVERSION 3,3,0,0xa7
+ FILEVERSION 3,3,0,0xa9
+ PRODUCTVERSION 3,3,0,0xa9
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +45,12 @@ BEGIN
  BEGIN
  VALUE "CompanyName", "AED Group; University of Western Australia"
  VALUE "FileDescription", "General Lake Model (GLM) with AED+"
- VALUE "FileVersion", "3.3.0a7 \0"
+ VALUE "FileVersion", "3.3.0a9 \0"
  VALUE "InternalName", "version.rc"
  VALUE "LegalCopyright", "Copyright (C) 2022"
  VALUE "OriginalFilename", "version.rc"
  VALUE "ProductName", "GLM+"
- VALUE "ProductVersion", "3.3.0a7 \0"
+ VALUE "ProductVersion", "3.3.0a9 \0"
  END
  END
  BLOCK "VarFileInfo"

diff --git a/win/glm.rc b/win/glm.rc
@@ -27,8 +27,8 @@ END
 
 //==============================================================================
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,0,0xa7
- PRODUCTVERSION 3,3,0,0xa7
+ FILEVERSION 3,3,0,0xa9
+ PRODUCTVERSION 3,3,0,0xa9
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +45,12 @@ BEGIN
  BEGIN
  VALUE "CompanyName", "AED Group; University of Western Australia"
  VALUE "FileDescription", "General Lake Model (GLM)"
- VALUE "FileVersion", "3.3.0a7 \0"
+ VALUE "FileVersion", "3.3.0a9 \0"
  VALUE "InternalName", "version.rc"
  VALUE "LegalCopyright", "Copyright (C) 2022"
  VALUE "OriginalFilename", "version.rc"
  VALUE "ProductName", "GLM"
- VALUE "ProductVersion", "3.3.0a7 \0"
+ VALUE "ProductVersion", "3.3.0a9 \0"
  END
  END
  BLOCK "VarFileInfo"

diff --git a/win/vs-glm-with-fabm/glm+.vcxproj b/win/vs-glm-with-fabm/glm+.vcxproj
@@ -72,7 +72,7 @@
  <ItemDefinitionGroup>
  <ClCompile>
  <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\win-3rd-party\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ancillary\windows\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>AED;FABM;PLOTS;XPLOTS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
  <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  <WarningLevel>Level3</WarningLevel>
@@ -82,7 +82,7 @@
  </ClCompile>
  <Link>
  <AdditionalDependencies>glm-aed.lib;libaed+.lib;glm-fabm.lib;fabm.lib;libutil.lib;libplot.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\win-3rd-party\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\ancillary\windows\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  </Link>
  </ItemDefinitionGroup>

diff --git a/win/vs-glm-with-fabm/glm.vcxproj b/win/vs-glm-with-fabm/glm.vcxproj
@@ -69,15 +69,15 @@
  </ImportGroup>
  <ItemDefinitionGroup>
  <ClCompile>
- <AdditionalIncludeDirectories>..\..\..\win-3rd-party\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ancillary\windows\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>AED;FABM;PLOTS;XPLOTS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
  <WarningLevel>Level3</WarningLevel>
  <CallingConvention>Cdecl</CallingConvention>
  <CompileAs>CompileAsC</CompileAs>
  </ClCompile>
  <Link>
  <AdditionalDependencies>glm-aed.lib;libaed.lib;glm-fabm.lib;fabm.lib;libutil.lib;libplot.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\win-3rd-party\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\ancillary\windows\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  </Link>
  </ItemDefinitionGroup>

diff --git a/win/vs-glm-wq-dll/glm.vcxproj b/win/vs-glm-wq-dll/glm.vcxproj
@@ -71,7 +71,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
  <ClCompile>
- <AdditionalIncludeDirectories>..\..\..\win-3rd-party\$(Platform)-$(Configuration)\include;..\..\..\libutil\include;..\..\..\libplot\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ancillary\windows\$(Platform)-$(Configuration)\include;..\..\..\libutil\include;..\..\..\libplot\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>USE_DL_LOADER=1;PLOTS;XPLOTS;_LIB;NONDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <WarningLevel>Level3</WarningLevel>
  <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -80,7 +80,7 @@
  </ClCompile>
  <Link>
  <AdditionalDependencies>libutil.lib;libplot.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\win-3rd-party\$(Platform)-$(Configuration)\lib\;$(Platform)-$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\ancillary\windows\$(Platform)-$(Configuration)\lib\;$(Platform)-$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">

diff --git a/win/vs-glm/build_glm+.bat b/win/vs-glm/build_glm+.bat
@@ -0,0 +1,7 @@
+@echo off
+
+for /f "usebackq delims=#" %%a in (`"%programfiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do set VS_BASE_PATH=%%a\Common7
+
+call "%VS_BASE_PATH%\Tools\VsDevCmd.bat" -arch=amd64
+
+"%VS_BASE_PATH%\IDE\devenv" glm+.sln /Build "Release|x64"
diff --git a/win/vs-glm/build_glm.bat b/win/vs-glm/build_glm.bat
@@ -0,0 +1,7 @@
+@echo off
+
+for /f "usebackq delims=#" %%a in (`"%programfiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do set VS_BASE_PATH=%%a\Common7
+
+call "%VS_BASE_PATH%\Tools\VsDevCmd.bat" -arch=amd64
+
+"%VS_BASE_PATH%\IDE\devenv" glm.sln /Build "Release|x64"
diff --git a/win/vs-glm/glm+.vcxproj b/win/vs-glm/glm+.vcxproj
@@ -69,15 +69,15 @@
  </ImportGroup>
  <ItemDefinitionGroup>
  <ClCompile>
- <AdditionalIncludeDirectories>..\..\..\win-3rd-party\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ancillary\windows\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>AED;AED2;PLOTS;XPLOTS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
  <WarningLevel>Level3</WarningLevel>
  <CallingConvention>Cdecl</CallingConvention>
  <CompileAs>CompileAsC</CompileAs>
  </ClCompile>
  <Link>
  <AdditionalDependencies>glm-aed.lib;libaed-water.lib;libaed-benthic.lib;libaed-riparian.lib;libaed-demo.lib;glm-aed2.lib;libaed-dev.lib;libaed2+.lib;libutil.lib;libplot.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\win-3rd-party\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\ancillary\windows\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  </Link>
  </ItemDefinitionGroup>

diff --git a/win/vs-glm/glm.vcxproj b/win/vs-glm/glm.vcxproj
@@ -69,15 +69,15 @@
  </ImportGroup>
  <ItemDefinitionGroup>
  <ClCompile>
- <AdditionalIncludeDirectories>..\..\..\win-3rd-party\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ancillary\windows\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>AED;AED2;PLOTS;XPLOTS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
  <WarningLevel>Level3</WarningLevel>
  <CallingConvention>Cdecl</CallingConvention>
  <CompileAs>CompileAsC</CompileAs>
  </ClCompile>
  <Link>
  <AdditionalDependencies>glm-aed.lib;libaed-water.lib;libaed-benthic.lib;libaed-demo.lib;glm-aed2.lib;libaed2.lib;libutil.lib;libplot.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\win-3rd-party\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\ancillary\windows\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  </Link>
  </ItemDefinitionGroup>

diff --git a/win/vs-libglm/libglm+.vcxproj b/win/vs-libglm/libglm+.vcxproj
@@ -76,15 +76,15 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
  <ClCompile>
- <AdditionalIncludeDirectories>..\..\..\win-3rd-party\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ancillary\windows\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>AED;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
  <WarningLevel>Level3</WarningLevel>
  <CallingConvention>Cdecl</CallingConvention>
  <CompileAs>CompileAsC</CompileAs>
  </ClCompile>
  <Link>
  <AdditionalDependencies>glm-aed.lib;libaed+.lib;libutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\win-3rd-party\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\ancillary\windows\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  </Link>
  </ItemDefinitionGroup>

diff --git a/win/vs-libglm/libglm.vcxproj b/win/vs-libglm/libglm.vcxproj
@@ -76,15 +76,15 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
  <ClCompile>
- <AdditionalIncludeDirectories>..\..\..\win-3rd-party\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\ancillary\windows\$(Platform)-$(Configuration)\include;..\..\..\libplot\include;..\..\..\libutil\include;..\</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>AED;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
  <WarningLevel>Level3</WarningLevel>
  <CallingConvention>Cdecl</CallingConvention>
  <CompileAs>CompileAsC</CompileAs>
  </ClCompile>
  <Link>
  <AdditionalDependencies>glm-aed.lib;libaed.lib;libutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\win-3rd-party\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(Platform)-$(Configuration)\;$(Platform)-$(Configuration)\lib\;..\..\..\ancillary\windows\$(Platform)-$(Configuration)\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  </Link>
  </ItemDefinitionGroup>