janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 20:13:32 +01:00
Code Activity

$(TOPDIR), make, scripts: Search-and-replace ytools -> jw-build

Browse source 
This project was copied from ytools, with anything not related to providing
build-functionality left out. This commit replaces the occurences of ytools
with jw-build, and removes some but most certainly not all legacy ytools
references.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-07 12:15:48 +00:00
commit 55fa0eaec5
22 changed files with 92 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

37
scripts/Makefile
View file

@ -1,41 +1,8 @@
########################################################################
# #
# development utilities #
# (c) 2001 jannet it services #
# Authors: Jan Lindemann #
# contact@jannet.de #
# patches, bugfixes and comments are welcome at patch@jannet.de #
# #
# $Id$
# #
# This program is free software; permission to use, copy, modify, #
# distribute, and sell this software and its documentation under the #
# terms of the GNU Public license as published by the Free Software #
# Foundation, either version 2 or any later version of the license, is #
# hereby granted without fee, provided that (i) the above copyright #
# notices and this permission notice appear in all copies of the #
# software and related documentation, and (ii) the name of jannet may #
# not be used in any advertising or publicity relating to the software #
# without the specific, prior written permission of jannet. #
# #
# This program is distributed in the hope that it will be useful, but #
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- #
# TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General #
# Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program; if not, write to the Free Software Founda- #
# tion, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #
# #
########################################################################
TOPDIR = ../..
TOPDIR = ..
include $(TOPDIR)/make/proj.mk
EXE_SH += cvsbuild jannet rn
EXE_SH += jannet
include $(MODDIR)/make/scripts.mk
blah:
@echo $(BUILD_SCRIPT)

4
scripts/create-pkg-config.sh
View file

@ -4,7 +4,7 @@ try_assign_sec()
{
local file="$1"
local sec="$2"
local val=`_ytools_cat_section "$file" "$sec"`
local val=`_jw-build_cat_section "$file" "$sec"`
[ -n "$val" ] && eval $3=\"$val\"
}
@ -106,7 +106,7 @@ shift
set +e
[ -r "$project_descr_file" ] && {
. ytools-functions.sh
. jw-build-functions.sh
try_assign_sec $project_descr_file description descr
try_assign_sec $project_descr_file summary summary
try_assign_sec $project_descr_file requires_run requires_run

2
scripts/git-srv-admin.sh
View file

@ -131,7 +131,7 @@ if [ "$user" ]; then
id=$user
else
if [ "$SUDO_UID" ]; then
id=`/opt/ytools/bin/getpwuid $SUDO_UID | sed '/^name *=/ !d; s/^name *= *//'`
id=`/opt/jw-build/bin/getpwuid $SUDO_UID | sed '/^name *=/ !d; s/^name *= *//'`
[ "$id" ] || fatal "failed to find uid $SUDO_UID in user database"
fi
user=$id

2
scripts/jannet
View file

@ -65,7 +65,7 @@ create_ldconfig_state()
check_ldconfig()
{
local state=/var/log/ytools-ldconf.state
local state=/var/log/jw-build-ldconf.state
[ -f $state ] && create_ldconfig_state | diff $state - >/dev/null 2>&1 && return
echo -n "running ldconfig ... "
/sbin/ldconfig

2
scripts/pgit.sh
View file

@ -58,7 +58,7 @@ clone()
local projects="$PGIT_CLONE_PROJECTS"
[ "$login" ] || login=`whoami`
[ "$fromuser" ] || fromuser=`whoami`
local git_srv_admin="$SSH $login@git.jannet.de /opt/ytools/bin/git-srv-admin.sh"
local git_srv_admin="$SSH $login@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh"
if [ -z "$projects" ]; then
projects=`$git_srv_admin -u $fromuser -j list-personal-projects`
[ "$?" != 0 ] && exit 1

2
scripts/projects.py
View file

@ -42,7 +42,7 @@ def remove_duplicates(seq):
return [x for x in seq if not (x in seen or seen_add(x))]
def get_os(args = ""):
for d in [ projs_root + '/ytools/devutil/scripts', '/opt/ytools/bin' ]:
for d in [ projs_root + '/jw-build/devutil/scripts', '/opt/jw-build/bin' ]:
script = d + '/get_os.sh'
if isfile(script):
cmd = '/bin/bash ' + script