Lots of changes in structure to make it possible to package the program while
still allowing workflows to be placed in several locations in the file system. The installation procedure is now ./configure && make install configure will run m4 on fluents/paths.py.m4, Makefile.m4 and doc/Makefile.m4 so that the installation system and the program will know where some important directories are located. The paths.py.m4 and consequently also pahts.py files are just listings of directories configured during install. I did this to separate these from all other files so that as little as possible is touched by m4. It is still necessary to do an install now to get the program to run in a clean checkout. Workflows can now be placed anywhere in the system. This is done by setting the workflowdir variable in the configuration file. All workflow directories, separated by semicolons, are added to the python path. The use of setup.py is now deprecated.
This commit is contained in:
18
debian/rules
vendored
18
debian/rules
vendored
@@ -13,22 +13,21 @@ CFLAGS = -Wall -g
|
||||
PYVERS=$(shell pyversions -vs)
|
||||
|
||||
configure: configure-stamp
|
||||
|
||||
configure-stamp:
|
||||
dh_testdir
|
||||
|
||||
touch configure-stamp
|
||||
|
||||
build: $(PYVERS:%=build-python%)
|
||||
|
||||
build-python%:
|
||||
dh_testdir
|
||||
python$* setup.py build
|
||||
# python$* setup.py build
|
||||
touch $@
|
||||
|
||||
clean:
|
||||
# Add here commands to clean up after the build process.
|
||||
-rm -r build
|
||||
|
||||
dh_clean
|
||||
|
||||
install: build $(PYVERS:%=install-python%)
|
||||
@@ -37,8 +36,10 @@ install-python%:
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
|
||||
python$* setup.py install --root=$(CURDIR)/debian/fluents --install-data=/usr/share/fluents
|
||||
./configure --prefix ${CURDIR}/debian/fluents/usr
|
||||
sed -i 's:${CURDIR}/debian/fluents::' fluents/paths.py
|
||||
make install
|
||||
# python$* setup.py install --root=$(CURDIR)/debian/fluents --install-data=/usr/share/fluents
|
||||
|
||||
# Remove all *.pyc files, created in the postinst
|
||||
# find $(CURDIR)/debian/python-networkx -name "*.pyc" -exec rm {} ';'
|
||||
@@ -46,8 +47,9 @@ install-python%:
|
||||
|
||||
# Build architecture-independent files here.
|
||||
binary-indep: build install
|
||||
mkdir -p $(CURDIR)/debian/fluents-doc/usr/share/doc/fluents-doc/html
|
||||
epydoc --html -o $(CURDIR)/debian/fluents-doc/usr/share/doc/fluents-doc/html fluents
|
||||
make -C doc install
|
||||
# mkdir -p $(CURDIR)/debian/fluents-doc/usr/share/doc/fluents-doc/html
|
||||
# epydoc --html -o $(CURDIR)/debian/fluents-doc/usr/share/doc/fluents-doc/html fluents
|
||||
|
||||
# Build architecture-dependent files here.
|
||||
binary-arch: build install
|
||||
@@ -70,4 +72,4 @@ binary-arch: build install
|
||||
dh_builddeb
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
.PHONY: build clean binary-indep binary-arch binary install configure
|
||||
.PHONY: build clean binary-indep binary-arch binary install configure
|
||||
|
Reference in New Issue
Block a user