Fix error in headers install dir on windows

das-developers · Nov 20, 2023 · 0811c1e · 0811c1e
1 parent 4a0a840
commit 0811c1e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/buildfiles/Windows.mak b/buildfiles/Windows.mak
@@ -18,7 +18,7 @@ CFLAGS=$(CFLAGS) /DEBUG /DWISDOM_FILE=C:/ProgramData/fftw3/wisdom.dat $(INC)
 ED=$(LIBRARY_LIB)
 !if defined(CONDA_BUILD_STATE)
 EXPAT_LIB=$(ED)\libexpat.lib
-INSTALL_PREFIX:=$(PREFIX)
+INSTALL_PREFIX=$(PREFIX)
 !else
 EXPAT_LIB=$(ED)\libexpatMD.lib
 !endif
@@ -129,13 +129,17 @@ $(BD)\$(TARG).dll:$(DLL_OBJS)
 	link /nologo /ltcg /dll $(DLL_OBJS) $(EX_LIBS) /out:$(BD)\$(TARG).dll /implib:$(BD)\$(TARG).lib
 
 install:
+	@if "$(INSTALL_PREFIX)"=="" ( \
+		@echo ERROR: Install location ^%INSTALL_PREFIX^% undefined. Set INSTALL_PREFIX before nmake install. \
+		@exit /b 3 \
+	)
 	if not exist $(INSTALL_PREFIX)\bin\$(N_ARCH) mkdir $(INSTALL_PREFIX)\bin\$(N_ARCH)
 	if not exist $(INSTALL_PREFIX)\lib\$(N_ARCH) mkdir $(INSTALL_PREFIX)\lib\$(N_ARCH)
-	if not exist $(INSTALL_PREFIX)\include\$(N_ARCH)\das2 mkdir $(INSTALL_PREFIX)\include\$(N_ARCH)\das2
+	if not exist $(INSTALL_PREFIX)\include\das2 mkdir $(INSTALL_PREFIX)\include\das2
 	copy $(BD)\lib$(TARG).lib $(INSTALL_PREFIX)\lib\$(N_ARCH)
 	copy $(BD)\$(TARG).dll $(INSTALL_PREFIX)\bin\$(N_ARCH)
 	copy $(BD)\$(TARG).lib $(INSTALL_PREFIX)\lib\$(N_ARCH)
-	for %I in ( $(HDRS) ) do copy %I $(INSTALL_PREFIX)\include\$(N_ARCH)
+	for %I in ( $(HDRS) ) do copy %I $(INSTALL_PREFIX)\include\das2
 	for %I in ( $(UTIL_PROGS) ) do copy %I $(INSTALL_PREFIX)\bin\$(N_ARCH)
 
 # Override rule for utility programs that need more than one source file

diff --git a/buildfiles/conda/bld.bat b/buildfiles/conda/bld.bat
@@ -1,4 +1,4 @@
-set N_ARCH=/
+set N_ARCH=\
 
 nmake.exe /nologo /f buildfiles\Windows.mak clean
 

diff --git a/buildfiles/conda/meta.yaml b/buildfiles/conda/meta.yaml
@@ -3,20 +3,22 @@
 # HASH=$(openssl sha256  das2C-${VERSION}.tar.gz | awk '{print $2}')
 #
 # Example:
-#  openssl sha256 das2C-2.3-pre3.tar.gz | awk '{print $2}'
+#  openssl sha256 das2C-tmp.tar.gz | awk '{print $2}'
 
 {% set name = "das2c" %}
 {% set conda_version = "2.3.0" %}
 {% set git_version = "2.3.0" %}
-{% set sha256 = "1148520e3ae9a193c478d9dd6d001b1222d976d99adf975e7feb6f9b2eedef6c" %}
+#{% set sha256 = "6362189d746045b2294810f28d9319f60f1f035a3df71667a1d09677248f3e2e" %}
+{% set sha256 = "6530b7b78e995f951ecf1598ca9dd9ff7ee7a8ba53ffcbc8d06d50ea0b4a0c4c" %}
 
 package:
    name: {{ name }} 
    version: {{ conda_version }} 
 
 source:
    fn:  das2C-{{ git_version }}.tar.gz
-   url: https://github.com/das-developers/das2C/archive/refs/tags/v{{ git_version }}.tar.gz
+   #url: https://github.com/das-developers/das2C/archive/refs/tags/v{{ git_version }}.tar.gz
+   url: https://space.physics.uiowa.edu/~pikerc/das2C-tmp.tar.gz
    sha256: {{ sha256 }}