Commit 718f1db8 authored by Sven Breuner's avatar Sven Breuner

general: set VER and RELEASE_STR in rules.in for deb packages

debuild clears all environment variables, so we now set the VER and
RELEASE_STR values directly in the rules file to pass them to make.
parent f2872ef3
......@@ -24,6 +24,8 @@ build-stamp: $(QUILT_STAMPFN) configure-stamp
dh_testdir
make FHGFS_VERSION='__FHGFS_VERSION__' \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
FHGFS_OPENTK_PATH='__FHGFS_OPENTK_PATH__' \
FHGFS_THIRDPARTY_PATH='__FHGFS_THIRDPARTY_PATH__' \
......
......@@ -29,10 +29,12 @@ sed \
-e "s#__FHGFS_COMMON_PACKAGE_PATH__#$FHGFS_COMMON_PACKAGE_PATH#g" \
-e "s#__FHGFS_THIRDPARTY_PATH__#$FHGFS_THIRDPARTY_PATH#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s#__FHGFS_SETUP_PATH__#$FHGFS_SETUP_PATH#g" \
-e "s#__ADMON_GUI_PATH__#$ADMON_GUI_PATH#g" \
-e "s#__JAVA_HOME__#$JAVA_HOME#g" \
-e "s#__FHGFS_SETUP_PATH__#$FHGFS_SETUP_PATH#g" \
-e "s#__ADMON_GUI_PATH__#$ADMON_GUI_PATH#g" \
-e "s#__JAVA_HOME__#$JAVA_HOME#g" \
-e "s#__ADMON_GUI_EXTERNAL_JAR_PATH__#$ADMON_GUI_EXTERNAL_JAR_PATH#g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
......
......@@ -28,8 +28,10 @@ clean:
rm -f build-stamp configure-stamp
make FHGFS_CLIENT_OPENTK_PATH=__FHGFS_CLIENT_OPENTK_PATH__ \
RELEASE_PATH=$(DEB_BUILD_ROOT)/opt/fhgfs/src/client \
FHGFS_VERSION=__FHGFS_VERSION__ \
RELEASE_PATH=$(DEB_BUILD_ROOT)/opt/fhgfs/src/client \
FHGFS_VERSION=__FHGFS_VERSION__ \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
KDIR='__KDIR__' \
USER_CXXFLAGS='__USER_CXXFLAGS__' \
USER_LDFLAGS='__USER_LDFLAGS__' \
......@@ -45,8 +47,10 @@ install: build
dh_installdirs
make FHGFS_CLIENT_OPENTK_PATH=__FHGFS_CLIENT_OPENTK_PATH__ \
RELEASE_PATH=$(DEB_BUILD_ROOT)/opt/fhgfs/src/client \
RELEASE_PATH=$(DEB_BUILD_ROOT)/opt/fhgfs/src/client \
FHGFS_VERSION=__FHGFS_VERSION__ \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
KDIR='__KDIR__' \
WITHOUT_OPENTK=1 V=1 -j4 prepare_release
......
......@@ -30,6 +30,8 @@ sed \
sed \
-e "s#__FHGFS_CLIENT_OPENTK_PATH__#$FHGFS_CLIENT_OPENTK_PATH#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s#__KDIR__#$KDIR#g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
......
......@@ -38,6 +38,8 @@ install: build
dh_installdirs
make FHGFS_VERSION='__FHGFS_VERSION__' \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
RELEASE_PATH=$(DEB_BUILD_ROOT)/opt/fhgfs/src/client \
USER_CXXFLAGS='__USER_CXXFLAGS__' \
USER_LDFLAGS='__USER_LDFLAGS__' \
......
......@@ -26,6 +26,8 @@ sed \
sed \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s#__KDIR__#$KDIR#g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
......
......@@ -19,6 +19,8 @@ build-stamp: $(QUILT_STAMPFN) configure-stamp
dh_testdir
# make FHGFS_VERSION='__FHGFS_VERSION__' \
# VER='__VER__' \
# RELEASE_STR='__RELEASE_STR__' \
# FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
# FHGFS_OPENTK_PATH='__FHGFS_OPENTK_PATH__' \
# FHGFS_ONLINE_CFG_PATH='__FHGFS_ONLINE_CFG_PATH__' \
......@@ -36,6 +38,8 @@ clean:
rm -f build-stamp configure-stamp
# make FHGFS_VERSION='__FHGFS_VERSION__' \
# VER='__VER__' \
# RELEASE_STR='__RELEASE_STR__' \
# FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
# FHGFS_OPENTK_PATH='__FHGFS_OPENTK_PATH__' \
# FHGFS_ONLINE_CFG_PATH='__FHGFS_ONLINE_CFG_PATH__' \
......
......@@ -25,11 +25,13 @@ sed \
-e "s#__FHGFS_COMMON_PATH__#$FHGFS_COMMON_PATH#g" \
-e "s#__FHGFS_OPENTK_PATH__#$FHGFS_OPENTK_PATH#g" \
-e "s#__FHGFS_ONLINE_CFG_PATH__#$FHGFS_ONLINE_CFG_PATH#g" \
-e "s#__FHGFS_FSCK_PATH__#$FHGFS_FSCK_PATH#g" \
-e "s#__FHGFS_FSCK_PATH__#$FHGFS_FSCK_PATH#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
${RULES}.in > ${RULES}
chmod +x debian/rules
......
......@@ -22,6 +22,8 @@ build-stamp: $(QUILT_STAMPFN) configure-stamp
dh_testdir
make FHGFS_VERSION='__FHGFS_VERSION__' \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
FHGFS_OPENTK_PATH='__FHGFS_OPENTK_PATH__' \
FHGFS_THIRDPARTY_PATH='__FHGFS_THIRDPARTY_PATH__' \
......
......@@ -28,6 +28,8 @@ sed \
-e "s#__FHGFS_COMMON_PACKAGE_PATH__#$FHGFS_COMMON_PACKAGE_PATH#g" \
-e "s#__FHGFS_THIRDPARTY_PATH__#$FHGFS_THIRDPARTY_PATH#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
......
......@@ -22,6 +22,8 @@ build-stamp: $(QUILT_STAMPFN) configure-stamp
dh_testdir
make FHGFS_VERSION='__FHGFS_VERSION__' \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
FHGFS_OPENTK_PATH='__FHGFS_OPENTK_PATH__' \
FHGFS_THIRDPARTY_PATH='__FHGFS_THIRDPARTY_PATH__' \
......
......@@ -28,6 +28,8 @@ sed \
-e "s#__FHGFS_COMMON_PACKAGE_PATH__#$FHGFS_COMMON_PACKAGE_PATH#g" \
-e "s#__FHGFS_THIRDPARTY_PATH__#$FHGFS_THIRDPARTY_PATH#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
......
......@@ -22,6 +22,8 @@ build-stamp: $(QUILT_STAMPFN) configure-stamp
dh_testdir
make FHGFS_VERSION='__FHGFS_VERSION__' \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
FHGFS_OPENTK_PATH='__FHGFS_OPENTK_PATH__' \
FHGFS_THIRDPARTY_PATH='__FHGFS_THIRDPARTY_PATH__' \
......
......@@ -28,6 +28,8 @@ sed \
-e "s#__FHGFS_COMMON_PACKAGE_PATH__#$FHGFS_COMMON_PACKAGE_PATH#g" \
-e "s#__FHGFS_THIRDPARTY_PATH__#$FHGFS_THIRDPARTY_PATH#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
......
......@@ -18,11 +18,14 @@ build: build-stamp
build-stamp: $(QUILT_STAMPFN) configure-stamp
dh_testdir
make FHGFS_VERSION='__FHGFS_VERSION__' FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
USER_CXXFLAGS='__USER_CXXFLAGS__' \
USER_LDFLAGS='__USER_LDFLAGS__' \
-j4 \
package_lib
make FHGFS_VERSION='__FHGFS_VERSION__' \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
USER_CXXFLAGS='__USER_CXXFLAGS__' \
USER_LDFLAGS='__USER_LDFLAGS__' \
-j4 \
package_lib
touch build-stamp
......
......@@ -21,9 +21,11 @@ sed \
sed \
-e "s#__FHGFS_COMMON_PATH__#$FHGFS_COMMON_PATH#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
${RULES}.in > ${RULES}
chmod +x debian/rules
......
......@@ -22,6 +22,8 @@ build-stamp: $(QUILT_STAMPFN) configure-stamp
dh_testdir
make FHGFS_VERSION='__FHGFS_VERSION__' \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
FHGFS_OPENTK_PATH='__FHGFS_OPENTK_PATH__' \
FHGFS_THIRDPARTY_PATH='__FHGFS_THIRDPARTY_PATH__' \
......
......@@ -28,6 +28,8 @@ sed \
-e "s#__FHGFS_COMMON_PACKAGE_PATH__#$FHGFS_COMMON_PACKAGE_PATH#g" \
-e "s#__FHGFS_THIRDPARTY_PATH__#$FHGFS_THIRDPARTY_PATH#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
......
......@@ -33,6 +33,8 @@ sed \
-e "s#__FHGFS_META_2012_10_UPGRADE_PATH__#${FHGFS_META_2012_10_UPGRADE_PATH}#g" \
-e "s#__FHGFS_STORAGE_2012_10_UPGRADE_PATH__#${FHGFS_STORAGE_2012_10_UPGRADE_PATH}#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
......
......@@ -19,6 +19,8 @@ build-stamp: $(QUILT_STAMPFN) configure-stamp
dh_testdir
make FHGFS_VERSION='__FHGFS_VERSION__' \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
FHGFS_OPENTK_PATH='__FHGFS_OPENTK_PATH__' \
FHGFS_THIRDPARTY_PATH='__FHGFS_THIRDPARTY_PATH__' \
......@@ -37,6 +39,8 @@ clean:
rm -f build-stamp configure-stamp
make FHGFS_VERSION='__FHGFS_VERSION__' \
VER='__VER__' \
RELEASE_STR='__RELEASE_STR__' \
FHGFS_COMMON_PATH='__FHGFS_COMMON_PATH__' \
FHGFS_OPENTK_PATH='__FHGFS_OPENTK_PATH__' \
FHGFS_ONLINE_CFG_PATH='__FHGFS_ONLINE_CFG_PATH__' \
......
......@@ -30,6 +30,8 @@ sed \
-e "s#__FHGFS_ONLINE_CFG_PATH__#$FHGFS_ONLINE_CFG_PATH#g" \
-e "s#__FHGFS_FSCK_PATH__#$FHGFS_FSCK_PATH#g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/g" \
-e "s/__RELEASE_STR__/$RELEASE_STR/g" \
-e "s/__NAME__/$NAME/g" \
-e "s/__USER_CXXFLAGS__/$USER_CXXFLAGS/g" \
-e "s/__USER_LDFLAGS__/$USER_LDFLAGS/g" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment