mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Arch linux build system improvements

metadata
Wenzel Jakob 2012-09-28 01:48:18 -04:00
parent 67e96f7aad
commit c52fa6402b
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/config-linux-gcc-debug.py
View File

@ -27,7 +27,7 @@ COLLADALIB = ['collada14dom']
# versions at the same time by explicitly specifying e.g. PYTHON27INCLUDE, # versions at the same time by explicitly specifying e.g. PYTHON27INCLUDE,
# PYTHON27LIB, PYTHON27LIBDIR and PYTHON32INCLUDE, PYTHON32LIB, PYTHON32LIBDIR # PYTHON27LIB, PYTHON27LIBDIR and PYTHON32INCLUDE, PYTHON32LIB, PYTHON32LIBDIR
pyver = str(sys.version_info[0])+str(sys.version_info[1]) pyver = os.popen("python --version 2>&1 | grep -oE '([[:digit:]].[[:digit:]])'").read().strip()
env = locals() env = locals()
env['PYTHON'+pyver+'INCLUDE'] = [] env['PYTHON'+pyver+'INCLUDE'] = []

2
build/config-linux-gcc.py
View File

@ -27,7 +27,7 @@ COLLADALIB = ['collada14dom']
# versions at the same time by explicitly specifying e.g. PYTHON27INCLUDE, # versions at the same time by explicitly specifying e.g. PYTHON27INCLUDE,
# PYTHON27LIB, PYTHON27LIBDIR and PYTHON32INCLUDE, PYTHON32LIB, PYTHON32LIBDIR # PYTHON27LIB, PYTHON27LIBDIR and PYTHON32INCLUDE, PYTHON32LIB, PYTHON32LIBDIR
pyver = str(sys.version_info[0])+str(sys.version_info[1]) pyver = os.popen("python --version 2>&1 | grep -oE '([[:digit:]].[[:digit:]])'").read().strip()
env = locals() env = locals()
env['PYTHON'+pyver+'INCLUDE'] = [] env['PYTHON'+pyver+'INCLUDE'] = []

16
data/linux/arch/mitsuba/PKGBUILD
View File

@ -17,14 +17,8 @@ _hgrepo="mitsuba"
build() { build() {
cd ${_hgrepo} cd ${_hgrepo}
cp build/config-linux.py config.py hg update bidir-0.4.0 # TODO: remove
if [ -e dependencies ]; then cp build/config-linux-gcc.py config.py
cd dependencies
hg pull -u
cd ..
else
hg clone https://www.mitsuba-renderer.org/hg/dependencies
fi
scons --jobs=$[${MAKEFLAGS/-j/} - 1] scons --jobs=$[${MAKEFLAGS/-j/} - 1]
} }
@ -36,10 +30,11 @@ package() {
${pkgdir}/usr/share/mitsuba/plugins \ ${pkgdir}/usr/share/mitsuba/plugins \
${pkgdir}/usr/share/mitsuba/data/schema \ ${pkgdir}/usr/share/mitsuba/data/schema \
${pkgdir}/usr/share/mitsuba/data/ior \ ${pkgdir}/usr/share/mitsuba/data/ior \
${pkgdir}/usr/share/mitsuba/data/microfacet \
${pkgdir}/usr/share/applications \ ${pkgdir}/usr/share/applications \
${pkgdir}/usr/share/pixmaps \ ${pkgdir}/usr/share/pixmaps \
${pkgdir}/usr/include/mitsuba/{core,hw,render,bidir} \ ${pkgdir}/usr/include/mitsuba/{core,hw,render,bidir} \
${pkgdir}/usr/lib/python2.7/lib-dynload ${pkgdir}/usr/lib/python3.2/lib-dynload
cd ${_hgrepo} cd ${_hgrepo}
install -m755 dist/mitsuba dist/mtsgui dist/mtsimport dist/mtssrv dist/mtsutil ${pkgdir}/usr/bin install -m755 dist/mitsuba dist/mtsgui dist/mtsimport dist/mtssrv dist/mtsutil ${pkgdir}/usr/bin
@ -51,7 +46,8 @@ package() {
install -m755 dist/plugins/* ${pkgdir}/usr/share/mitsuba/plugins install -m755 dist/plugins/* ${pkgdir}/usr/share/mitsuba/plugins
install -m644 dist/data/schema/* ${pkgdir}/usr/share/mitsuba/data/schema install -m644 dist/data/schema/* ${pkgdir}/usr/share/mitsuba/data/schema
install -m644 dist/data/ior/* ${pkgdir}/usr/share/mitsuba/data/ior install -m644 dist/data/ior/* ${pkgdir}/usr/share/mitsuba/data/ior
install -m644 dist/python/mitsuba.so ${pkgdir}/usr/lib/python2.7/lib-dynload install -m644 dist/data/microfacet/* ${pkgdir}/usr/share/mitsuba/data/microfacet
install -m644 dist/python/3.2/mitsuba.so ${pkgdir}/usr/lib/python3.2/lib-dynload
install -m644 data/linux/mitsuba.desktop ${pkgdir}/usr/share/applications install -m644 data/linux/mitsuba.desktop ${pkgdir}/usr/share/applications
install -m644 src/mtsgui/resources/mitsuba48.png ${pkgdir}/usr/share/pixmaps install -m644 src/mtsgui/resources/mitsuba48.png ${pkgdir}/usr/share/pixmaps
install -m644 include/mitsuba/*.h ${pkgdir}/usr/include/mitsuba install -m644 include/mitsuba/*.h ${pkgdir}/usr/include/mitsuba