janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

Everywhere: Rename MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR

Browse source 
Follow name change of MODDIR -> JWBDIR.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-29 21:45:24 +00:00
commit bdd66dbc26
25 changed files with 65 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/create-mkdebian.sh
View file

@ -123,7 +123,7 @@ override_dh_auto_install:
mkdir -p \`dirname \$INSTALL_LOG\`
> \$INSTALL_LOG
\\\$(MAKE) ENV_PREFIX=\\\$(ENV_PREFIX) INSTALL_LOG=\\\$(INSTALL_LOG) install
PATH=$MOD_SCRIPT_DIR:\\\$(PATH) /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR)
PATH=$JWB_SCRIPT_DIR:\\\$(PATH) /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR)
dh_installdirs
override_dh_shlibdeps:

2
scripts/create-mkspec.sh
View file

@ -102,7 +102,7 @@ _cat <<- EOT
|echo "mkdir -p \`dirname \$INSTALL_LOG\`"
|echo "> \$INSTALL_LOG"
|echo "make install"
|echo "export PATH=$MOD_SCRIPT_DIR:\\\$PATH"
|echo "export PATH=$JWB_SCRIPT_DIR:\\\$PATH"
|echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm -s \\"$subpackages\\" \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
|echo "exit 0" # <- Cut short CentOS magic appended to install scriptlet, which would generate .pyo files and other cruft.
EOT

24
scripts/pkg.sh
View file

@ -36,7 +36,7 @@ fatal()
os()
{
/bin/bash $MOD_SCRIPT_DIR/get-os.sh
/bin/bash $JWB_SCRIPT_DIR/get-os.sh
}
scm_commit()
@ -90,7 +90,7 @@ scm_files()
{
(
cd $TOPDIR
/bin/bash $MOD_SCRIPT_DIR/scm.sh ls-files -f $@
/bin/bash $JWB_SCRIPT_DIR/scm.sh ls-files -f $@
)
}
@ -448,18 +448,18 @@ build_pkg()
# --- generate spec file
local mkdef_sh=$TOPDIR/make/mk$deffmt.sh
local mkdef_wrapper_sh=$MOD_SCRIPT_DIR/mkspec-wrapper.sh
local mkdef_wrapper_sh=$JWB_SCRIPT_DIR/mkspec-wrapper.sh
[ ! -r $mkdef_wrapper_sh ] && \
fatal "Failed to read package definition deffmt wrapper script \"$mkdef_wrapper_sh\"."
scm_files | grep -q make/mk$deffmt.sh || {
local create_mkdef_sh=$MOD_SCRIPT_DIR/create-mk$deffmt.sh
local create_mkdef_sh=$JWB_SCRIPT_DIR/create-mk$deffmt.sh
[ ! -r "$PROJECT_DESCR_FILE" ] && \
fatal "Failed to read project description file \"$PROJECT_DESCR_FILE\"."
[ ! -r "$create_mkdef_sh" ] && \
fatal "Failed to read package build definition creation script \"$create_mkdef_sh\"."
PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp
PATH=$JWB_SCRIPT_DIR:$PATH /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp
mv $mkdef_sh.tmp $mkdef_sh
tmp_mkdef_sh="$tmp_mkdef_sh $mkdef_sh"
}
@ -469,7 +469,7 @@ build_pkg()
(
cd $src_tree
PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $mkdef_wrapper_sh $mkdef_sh \
PATH=$JWB_SCRIPT_DIR:$PATH /bin/bash $mkdef_wrapper_sh $mkdef_sh \
-V $version \
-S $tar_archive \
-N $RPM_PROJECT \
@ -503,7 +503,7 @@ build_pkg()
#exit
#cp $DIST_PCKG_DIR/$tar_archive $src_tree/../$tar_archive_orig
(
local mod_script_dir=`readlink -f $MOD_SCRIPT_DIR`
local mod_script_dir=`readlink -f $JWB_SCRIPT_DIR`
cd $src_tree
#export ENV_PREFIX=`readlink -f $TOPDIR`/$DIST_INST_DIR
#export INSTALL_LOG=blah
@ -566,7 +566,7 @@ upload_file()
esac
esac
echo "+ uploading $target"
RSYNC_RSH=$SSH /bin/bash $MOD_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target
RSYNC_RSH=$SSH /bin/bash $JWB_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target
}
upload_pkg()
@ -1068,7 +1068,7 @@ while [ ${1:0:1} = - ]; do
shift
;;
-m)
eval MOD_SCRIPT_DIR=\"$2\"
eval JWB_SCRIPT_DIR=\"$2\"
shift
;;
-N)
@ -1127,13 +1127,13 @@ while [ ${1:0:1} = - ]; do
shift
done
[ "$MOD_SCRIPT_DIR" ] || MOD_SCRIPT_DIR=`dirname $0`
[ "$JWB_SCRIPT_DIR" ] || JWB_SCRIPT_DIR=`dirname $0`
[ "$PROJECT" ] || PROJECT=`abspath $TOPDIR | xargs basename`
cmd=$1
shift
export MOD_SCRIPT_DIR=`readlink -f $MOD_SCRIPT_DIR`
export JWB_SCRIPT_DIR=`readlink -f $JWB_SCRIPT_DIR`
export PKG_SH=`readlink -f $0`
@ -1157,7 +1157,7 @@ rpm)
RPM=/bin/rpm
;;
deb|debian)
RPM="/bin/bash $MOD_SCRIPT_DIR/dpm.sh"
RPM="/bin/bash $JWB_SCRIPT_DIR/dpm.sh"
;;
*)
fatal "Unknown package format \"$PKG_FORMAT\""