Updated conda packaging scripts

Author: bkryza

packaging/Makefile

@@ -58,7 +58,7 @@ _BUILD/$(SOURCE_ARCHIVE):
 		echo "Creating source archive from latest commit $(COMMIT) - $(SOURCE_ARCHIVE)"
 		echo "############################"
 		mkdir -p $(build_dir)
-		git-archive-all --prefix=$(NAME)-$(VERSION)-$(REBUILD)/ _BUILD/$(SOURCE_ARCHIVE)
+		git-archive-all --prefix=$(NAME)-$(VERSION)/ _BUILD/$(SOURCE_ARCHIVE)
 
 _BUILD/$(SOURCE_ARCHIVE_DEB):
 		echo "############################"
@@ -123,17 +123,19 @@ deb: _BUILD/$(SOURCE_ARCHIVE_DEB)
 		# BUILD LOCALLY BINARY PACKAGE
 		# debuild -us -uc
 
-conda: _BUILD/$(SOURCE_ARCHIVE)
+conda:
 		echo "############################"
 		echo "Creating conda archive from source file $(SOURCE_ARCHIVE)"
 		echo "############################"
 		conda config --add channels conda-forge
 		conda config --set channel_priority strict
 		mkdir -p _BUILD/conda
-		cp _BUILD/$(SOURCE_ARCHIVE) _BUILD/conda/
+		cd ..
+		git archive --format=tar.gz --prefix=clang-uml-$(VERSION)/ v$(VERSION) >packaging/_BUILD/conda/clang-uml-$(VERSION).tar.gz
+		cd packaging
 		cp conda/meta.yaml.in conda/meta.yaml
 		$(call subst_conda_meta_yaml,PKG_VERSION,${VERSION},conda)
-		$(call subst_conda_meta_yaml,PKG_SOURCE,..\/_BUILD\/clang-uml-$(VERSION).tar.$(TAR_EXT),conda)
+		$(call subst_conda_meta_yaml,PKG_SOURCE,..\/_BUILD\/conda\/clang-uml-$(VERSION).tar.$(TAR_EXT),conda)
 		$(call subst_conda_meta_yaml,GIT_COMMIT,${COMMIT},conda)
 		$(call subst_conda_meta_yaml,GIT_BRANCH,${BRANCH},conda)
-		conda build --user bkryza --token $(CONDA_TOKEN) conda
+		conda build --user bkryza --token $(CONDA_TOKEN) ./conda

packaging/README.md

@@ -34,8 +34,8 @@ find packaging/_BUILD/fedora
 ## Anaconda
 
 ```bash
-docker run --rm -v $PWD:$PWD continuum/miniconda3 bash
-conda install conda-build
+docker run --rm -v $PWD:$PWD continuumio/miniconda3 bash
+conda install conda-build make
 cd packaging
-make conda
+make CONDA_TOKEN=<TOKEN> conda
 ```

packaging/conda/build.sh

@@ -9,7 +9,8 @@ export CLANGUML_GIT_TOPLEVEL_DIR=${SRC_DIR}
 cmake -DCMAKE_BUILD_TYPE=Release \
 	  -DGIT_VERSION=${GIT_VERSION} \
 	  -DCODE_COVERAGE=OFF \
-	  -DWITH_TESTS=ON \
+	  -DBUILD_TESTS=OFF \
+	  -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" \
 	  -DLLVM_CONFIG_PATH=${BUILD_PREFIX}/bin/llvm-config \
 	  -DCONDA_BUILD_PREFIX=${BUILD_PREFIX} \
 	  -DCMAKE_INSTALL_PREFIX=${PREFIX} \
@@ -18,6 +19,4 @@ cmake -DCMAKE_BUILD_TYPE=Release \
 
 CTEST_OUTPUT_ON_FAILURE=1 make -j${CPU_COUNT}
 
-CTEST_OUTPUT_ON_FAILURE=1 ctest -j${CPU_COUNT}
-
 make install

packaging/conda/meta.yaml.in

@@ -9,7 +9,7 @@ source:
   url: "{{PKG_SOURCE}}"
 
 build:
-  binary_relocation: true
+  binary_relocation: false
   script_env:
     - PKG_VERSION
     - GIT_VERSION={{PKG_VERSION}}
@@ -23,14 +23,16 @@ requirements:
     - {{ compiler('cxx') }}
     - conda-forge::pkg-config
     - conda-forge::yaml-cpp 0.7.0
-    - conda-forge::clangdev 14.0.4
-    - conda-forge::libclang 14.0.4
+    - conda-forge::clangdev 15.0.6
+    - conda-forge::libclang 15.0.6
+    - conda-forge::libclang-cpp 15.0.6
     - conda-forge::cmake
     - conda-forge::git
     - conda-forge::make # [unix]
   run:
     - conda-forge::yaml-cpp 0.7.0
-    - conda-forge::libclang 14.0.4
+    - conda-forge::libclang 15.0.6
+    - conda-forge::libclang-cpp 15.0.6
 
 test:
   commands: