mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
Everywhere: Rename package "jw-build" to "jw-pkg"
jw-build doesn't stop at building software, packaging it afterwards is also a core feature, so this commit gives the package a better name. The commit replaces strings s/jw-build/jw-pkg/ in text files and file names. Fallout to the functionality is fixed, variable names are left as they are, though. To be adjusted by later commits. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
ca95a9d6b2
commit
9217d38964
50 changed files with 36 additions and 36 deletions
|
|
@ -58,7 +58,7 @@ cat_make_proj_mk()
|
|||
ifeq (\$(TARGET),mingw)
|
||||
FLAVOUR_PATH_PREFIX = win32/
|
||||
endif
|
||||
JWBDIR ?= \$(firstword \$(wildcard \$(DEV_PROJECTS_DIR)/jw-build \$(BUILD_TOOLS_PREFIX)/opt/\$(FLAVOUR_PATH_PREFIX)jw-build))
|
||||
JWBDIR ?= \$(firstword \$(wildcard \$(DEV_PROJECTS_DIR)/jw-pkg \$(BUILD_TOOLS_PREFIX)/opt/\$(FLAVOUR_PATH_PREFIX)jw-pkg))
|
||||
|
||||
USE_PROJECT_LIB = false
|
||||
HDRDIR_SCOPE_SUFFIX = \$(PROJECT)
|
||||
|
|
@ -92,8 +92,8 @@ cat_make_project_conf()
|
|||
libname = none
|
||||
|
||||
[pkg.requires.jw]
|
||||
devel = $name-run = VERSION-REVISION, jw-build-devel = VERSION
|
||||
build = jw-build-devel
|
||||
devel = $name-run = VERSION-REVISION, jw-pkg-devel = VERSION
|
||||
build = jw-pkg-devel
|
||||
EOT
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from jw.build.App import App
|
||||
from jw.pkg.App import App
|
||||
|
||||
App().run()
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ clone()
|
|||
local toref="${refspec[2]}"
|
||||
[ "$fromuser" ] || fromuser=$whoami
|
||||
[ "$fromref" ] || fromref=master
|
||||
local git_srv_admin="$SSH $login@git.janware.com /opt/jw-build/bin/git-srv-admin.sh"
|
||||
local git_srv_admin="$SSH $login@git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh"
|
||||
|
||||
if [ -z "$projects" ]; then
|
||||
projects=`$jw_projects list-repos --from-user $fromuser $remote_base`
|
||||
|
|
|
|||
|
|
@ -547,7 +547,7 @@ upload_file()
|
|||
;;
|
||||
*)
|
||||
target=$target_base/rpm/$t/$f:$upload_attrib
|
||||
#/srv/ftp/pub/packages/jw-foss/suse/tumbleweed/rpm/src/jw-build-1.0.0-74.src.rpm
|
||||
#/srv/ftp/pub/packages/jw-foss/suse/tumbleweed/rpm/src/jw-pkg-1.0.0-74.src.rpm
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -559,7 +559,7 @@ upload_file()
|
|||
;;
|
||||
*)
|
||||
target=$target_base/rpm/$t/$f:$upload_attrib
|
||||
#/srv/ftp/pub/packages/jw-foss/suse/tumbleweed/rpm/x86_64/jw-build-run-1.0.0-74.x86_64.rpm
|
||||
#/srv/ftp/pub/packages/jw-foss/suse/tumbleweed/rpm/x86_64/jw-pkg-run-1.0.0-74.x86_64.rpm
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ done
|
|||
local_cvs_proj=`ls -d */CVS 2>/dev/null | sed 's%/[^/]*%%'`
|
||||
local_git_proj=`ls -d */.git 2>/dev/null | sed 's%/[^/]*%%'`
|
||||
remote_cvs_proj=`$ssh cvs.janware.com find /srv/cvs/proj -maxdepth 1 -mindepth 1 -type d -executable -readable | sed 's%.*/%%'`
|
||||
remote_git_proj=`$ssh git.janware.com /opt/jw-build/bin/git-srv-admin.sh -j list-personal-projects`
|
||||
remote_git_proj=`$ssh git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh -j list-personal-projects`
|
||||
|
||||
date=`date +'%Y%m%d'`
|
||||
myname=`basename $0`
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue