Remove very old legacy files

They have been left untouched for very long and no need to keep them around.

Also, move contrib/release.sh into Makefile.

.gitlab-ci.yml

@@ -41,14 +41,6 @@ solvcon:opt:
   artifacts:
     untracked: true
 
-solvcon:release:
-  stage: build
-  script:
-    - env SC_PURE_PYTHON=1 contrib/release.sh
-  artifacts:
-    paths:
-      - dist/SOLVCON*.tar.gz
-
 libmarch:opt:gtest:
   dependencies:
     - libmarch:opt
@@ -83,3 +75,13 @@ solvcon:opt:test:parallel:
   stage: test
   script:
     - nosetests3 ftests/parallel/* -v
+
+solvcon:package:
+  stage: build
+  script:
+    - make SC_PURE_PYTHON=1 package
+    - make SC_PURE_PYTHON=1 build_from_package
+    - make VERBOSE=1 SC_PURE_PYTHON=1 test_from_package
+  artifacts:
+    paths:
+      - dist/SOLVCON*.tar.gz

.travis.yml

@@ -108,7 +108,7 @@ script:
     $SCRIPT_RUN_PREFIX $CXX --version
     $SCRIPT_RUN_PREFIX which $CC
     $SCRIPT_RUN_PREFIX $CC --version
-  - $SCRIPT_RUN_PREFIX env SC_PURE_PYTHON=1 contrib/release.sh
+  - $SCRIPT_RUN_PREFIX make SC_PURE_PYTHON=1 test_from_package
 
 after_script:
   - |

MANIFEST.in

@@ -5,26 +5,17 @@ include requirements.txt
 include README.rst HISTORY.rst CREDITS.rst COPYING
 include contrib/* contrib/*/*
 include doc/source/* doc/source/*/*
-include SCons* patch/*.patch
-include site_scons/site_tools/*.py
-include ground/*
-include soil/*
 recursive-include libmarch *
 prune libmarch/build
-recursive-include solvcon SCons*
 recursive-include solvcon *.py
 recursive-include solvcon *.pyx
 recursive-include solvcon *.pxd
 recursive-include solvcon *.h
 recursive-include solvcon *.c
 recursive-include solvcon *.c_body
-recursive-include include *
-recursive-include src *
 recursive-include test *
 include ftests/*/*.py
-include utests.legacy/*.py
 include examples/*/*/go
-include examples/*/*/SCons*
 include examples/*/*/*.tmpl
 include examples/*/*/*.py
 include examples/*/*/*.h

Makefile

@@ -1,40 +1,55 @@
 SHELL = /bin/bash
-PYTHON = $(shell which python3)
+PYTHON := $(shell which python3)
+NOSETESTS := $(shell which nosetests3)
+ifeq (${NOSETESTS},)
+	NOSETESTS := $(shell which nosetests)
+endif
+
+SC_PURE_PYTHON ?=
+export SC_PURE_PYTHON
+
 LIBMARCH_PATH ?= libmarch
 BUILD_DIR_NAME ?= opt_from_solvcon
 
 CMAKE_BUILD_TYPE ?= Release
 CMAKE_PASSTHROUGH ?=
 VERBOSE ?=
 
-build_dir = ${LIBMARCH_PATH}/build/${BUILD_DIR_NAME}
+ifneq (${VERBOSE},)
+	NOSETESTS := ${NOSETESTS} -v
+endif
+
+SCVER := $(shell env SC_PURE_PYTHON=1 ${PYTHON} -c 'import sys; import solvcon; sys.stdout.write("%s"%solvcon.__version__)')
+PKGNAME := SOLVCON-${SCVER}
+
+BUILD_DIR := ${LIBMARCH_PATH}/build/${BUILD_DIR_NAME}
 
 .PHONY: default
-default: everything
+default: build legacy
 
 .PHONY: everything
-everything: build legacy
-
-${build_dir}/Makefile:
-	mkdir -p ${build_dir}
-	cd ${build_dir} ; \
-		cmake ../.. \
-			-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-			-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON} \
-			-DMARCH_TEST=OFF \
-			-DMARCH_DESTINATION=$(realpath .) \
-			${CMAKE_PASSTHROUGH}
+everything: build legacy package
+
+${BUILD_DIR}/Makefile:
+	mkdir -p ${BUILD_DIR}
+	cd ${BUILD_DIR} ; \
+	cmake ../.. \
+		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
+		-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON} \
+		-DMARCH_TEST=OFF \
+		-DMARCH_DESTINATION=$(realpath .) \
+		${CMAKE_PASSTHROUGH}
 
 .PHONY: cmake
-cmake: ${build_dir}/Makefile
+cmake: ${BUILD_DIR}/Makefile
 
 .PHONY: clean_cmake
 clean_cmake:
-	rm -rf ${build_dir}
+	rm -rf ${BUILD_DIR}
 
 .PHONY: build
-build: ${build_dir}/Makefile
-	make -C ${build_dir} install VERBOSE=${VERBOSE}
+build: ${BUILD_DIR}/Makefile
+	make -C ${BUILD_DIR} install VERBOSE=${VERBOSE}
 
 .PHONY: clean_build
 clean_build:
@@ -49,7 +64,39 @@ legacy:
 
 .PHONY: clean_legacy
 clean_legacy:
-	${PYTHON} setup.py clean
+	env SC_PURE_PYTHON=1 ${PYTHON} setup.py clean
+
+dist/${PKGNAME}.tar.gz: Makefile
+	rm -rf dist/SOLVCON-${SCVER}* ; \
+	${PYTHON} setup.py clean ; \
+	${PYTHON} setup.py sdist
+
+.PHONY: package
+package: dist/${PKGNAME}.tar.gz
+
+dist/${PKGNAME}/make.log: dist/${PKGNAME}.tar.gz
+	if [[ ! -d "dist" ]] ; then \
+		echo "fatal error: dist doesn't exist" ; \
+		exit 1 ; \
+	fi ; \
+	cd dist ; \
+	rm -rf ${PKGNAME}/ ; \
+	tar xfz ${PKGNAME}.tar.gz ; \
+	cd ${PKGNAME} ; \
+	make 2>&1 | tee make.log
+
+.PHONY: build_from_package
+build_from_package: dist/${PKGNAME}/make.log
+
+.PHONY: test_from_package
+test_from_package: dist/${PKGNAME}/make.log
+	cd dist/${PKGNAME} ; \
+	PYTHONPATH=`pwd` ; \
+	${NOSETESTS} --with-doctest
+
+.PHONY: clean_package
+clean_package:
+	rm -rf dist/${PKGNAME}*
 
 .PHONY: clean
-clean: clean_legacy clean_current
+clean: clean_legacy clean_current clean_package