diff --git a/buildfiles/Darwin.mak b/buildfiles/Darwin.mak index 914bd1f..8c93142 100644 --- a/buildfiles/Darwin.mak +++ b/buildfiles/Darwin.mak @@ -1,8 +1,7 @@ # Export mac compatable md5sum command -MD5SUM=md5 -r -export MD5SUM - +export MD5SUM := md5 -r +export DIFFCMD := diff ############################################################################## # Project definitions @@ -52,12 +51,12 @@ WARNINGS:=-Wall -Wno-format-security -Wno-format-truncation ifeq ($(CONDA_BUILD_STATE),) # Non conda build, depends on homebrew -BREW_INC_DIR=/opt/homebrew/include -BREW_LIB_DIR=/opt/homebrew/lib +BREW_INC_DIR=/usr/local/include +BREW_LIB_DIR=/usr/local/lib ifeq ($(OPENSSL_DIR),) -OPENSSL_DIR=/opt/homebrew/opt/openssl +OPENSSL_DIR=/usr/local/opt/openssl endif SSL_INC=-I $(OPENSSL_DIR)/include @@ -73,8 +72,6 @@ LFLAGS= -L$(BREW_LIB_DIR) -lfftw3 -lexpat $(SSL_LIB) -lz -lm -lpthread else # Conda build -$(error wtf?) - SSL_INC= SSL_LIB=-lssl -lcrypto @@ -86,8 +83,6 @@ LFLAGS:=$(LDFLAGS) -lfftw3 -lexpat $(SSL_LIB) -lz -lm -lpthread endif - - ############################################################################## # Derived definitions diff --git a/buildfiles/conda/README.md b/buildfiles/conda/README.md index b0fd0d9..3e8845f 100644 --- a/buildfiles/conda/README.md +++ b/buildfiles/conda/README.md @@ -38,22 +38,21 @@ CONDA_BUILD_SYSROOT: ## Windows Notes -Before building anything for Windows you'll need a compiler. Microsoft makes -this more difficult to setup then any other operating system I normally work with. +Before building anything for Windows you'll need a compiler. Microsoft makes this +more difficult to setup then any other operating system I normally work with. Not +only will you need a copy of visual studio, you need the **particular version** of +visual studio that `conda build` looks for. The following link has +worked for me for miniconda3.9: -In the \notes directory of this repository you'll find a file named: - [install_visual_studio.txt](https://github.com/das-developers/das2C/blob/master/notes/install_visual_studio.txt) -Follow along there until you can run: -``` - \opt\vs\2022\buildtools\Common7\Tools\VsDevCmd.bat -``` -You'll need to invoke this command **after** entering the conda environment. Once -this is issued, move on to creating the pthreads4u and then the das2C packages. +(VS Build Tools 2015)[https://download.visualstudio.microsoft.com/download/pr/3e542575-929e-4297-b6c6-bef34d0ee648/639c868e1219c651793aff537a1d3b77/vs_buildtools.exe] + +Install this before proceeding. Das2C is built to be multi-thread safe. Thread safety is built around the POSIX threads library, which is native to Linux and MacOS. On Windows a wrapper library must be used instead. Before building das2C packages you'll -need to build pthreads4w (POSIX Threads for Windows). To do so: +need to build [pthreads4w](https://sourceforge.net/projects/pthreads4w/) +(POSIX Threads for Windows). To do so: ```dos cd das2C\buildfiles diff --git a/buildfiles/conda/meta.yaml b/buildfiles/conda/meta.yaml index 054654b..a130360 100644 --- a/buildfiles/conda/meta.yaml +++ b/buildfiles/conda/meta.yaml @@ -8,8 +8,7 @@ {% set name = "das2c" %} {% set conda_version = "2.3.0" %} {% set git_version = "2.3.0" %} -#{% set sha256 = "6362189d746045b2294810f28d9319f60f1f035a3df71667a1d09677248f3e2e" %} -{% set sha256 = "6530b7b78e995f951ecf1598ca9dd9ff7ee7a8ba53ffcbc8d06d50ea0b4a0c4c" %} +{% set sha256 = "6f3775f6153ccd8eee7efd5ac3f5a182b1fd34020bea136191dd493c31d72e95" %} package: name: {{ name }} diff --git a/buildfiles/rpm/das2C.spec b/buildfiles/rpm/das2C.spec index c17390e..af2bc66 100644 --- a/buildfiles/rpm/das2C.spec +++ b/buildfiles/rpm/das2C.spec @@ -1,6 +1,6 @@ Name: das2C -Version: 2.3 -%global tagver 2.3 +Version: 2.3.0 +%global tagver 2.3.0 Release: 1%{?dist} Summary: das2 stream utilities and catalog client in C @@ -88,6 +88,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/das2_histo %{_bindir}/das2_prtime %{_bindir}/das2_psd +%{_bindir}/das_node %{_libdir}/*.so %files devel @@ -97,5 +98,6 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 06 2023 Chris Piker - 2.3.0 * Sun Nov 28 2021 Chris Piker - 2.3-pre4 - First das2C package diff --git a/INSTALL.txt b/notes/install.txt similarity index 100% rename from INSTALL.txt rename to notes/install.txt