From cdf118d061648db234dbded8c4d1ca9a27f9638f Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 25 Nov 2023 00:02:42 +0800 Subject: fix ci --- scripts/makeppa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/makeppa b/scripts/makeppa index 53b559e10..2cf5fcc24 100755 --- a/scripts/makeppa +++ b/scripts/makeppa @@ -32,7 +32,7 @@ basename=xmake-$version+$patch$serie tarball=$workdir/$basename.tar.gz if [ ! -f $tarball ]; then cd core - xmake pack --autobuild=n --formats=targz --basename=xmake -o ../artifacts xmakesrc || exit -1 + xmake pack --autobuild=n -y --formats=srctargz --basename=xmake -o ../artifacts xmakesrc || exit -1 cd .. cp ./artifacts/xmake.tar.gz $tarball fi -- cgit v1.3.1 From 103bbe833dc6c1e8203cab0e842e49cfa426d0a4 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 25 Nov 2023 00:43:45 +0800 Subject: remove build-runfile --- scripts/makeself/build-runfile.sh | 67 --------------------------------------- 1 file changed, 67 deletions(-) delete mode 100755 scripts/makeself/build-runfile.sh (limited to 'scripts') diff --git a/scripts/makeself/build-runfile.sh b/scripts/makeself/build-runfile.sh deleted file mode 100755 index d3149a2cd..000000000 --- a/scripts/makeself/build-runfile.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env bash - -# path constants -cd "$(dirname "$0")/../.." -xmakeroot=`pwd` -buildroot=$xmakeroot/scripts/makeself -artifactsdir=$xmakeroot/artifacts -if [ ! -d $artifactsdir ]; then - mkdir $artifactsdir -fi -tmpdir=/tmp/xmake-makeself -if [ -d $tmpdir ]; then - rm -rf $tmpdir -fi -mkdir -p $tmpdir - -# copy xmake repo to tmpdir/repo, remove git ignored files -cp -r $xmakeroot $tmpdir/repo -cd $tmpdir/repo || exit -git reset --hard HEAD -git clean -dfX -git submodule foreach git clean -dfX - -# copy files to tmpdir/xmake -mkdir -p $tmpdir/xmake/scripts -cd $tmpdir/repo || exit -cp -r ./xmake $tmpdir/xmake/xmake -cp -r ./core $tmpdir/xmake -cp ./scripts/*.sh $tmpdir/xmake/scripts -cp ./*.md $tmpdir/xmake -cp configure $tmpdir/xmake -cd $tmpdir/xmake || exit -rm -rf ./core/src/tbox/tbox/src/demo -rm -rf ./core/src/tbox/tbox/src/tbox/platform/windows -rm -rf ./core/src/pdcurses -rm -rf ./core/src/luajit - -# prepare info texts -cd $tmpdir -cp $buildroot/* . -version=`cat ./xmake/core/xmake.lua | grep -E "^set_version" | grep -oE "[0-9]*\.[0-9]*\.[0-9]*"` -perl -pi -e "s/#xmake-version#/$version/g" ./header -perl -pi -e "s/#xmake-version#/$version/g" ./lsm - -# make run file -cd $tmpdir -makeself_version="2.5.0" -curl -fsSL https://github.com/megastep/makeself/releases/download/release-$makeself_version/makeself-$makeself_version.run -o ./makeself-$makeself_version.run -sh ./makeself-$makeself_version.run -./makeself-$makeself_version/makeself.sh \ - --gzip \ - --sha256 \ - --lsm ./lsm \ - --help-header ./header \ - ./xmake \ - $artifactsdir/xmake.gz.run \ - xmake-v$version-runfile \ - ./scripts/get.sh __local__ -./makeself-$makeself_version/makeself.sh \ - --xz \ - --sha256 \ - --lsm ./lsm \ - --help-header ./header \ - ./xmake \ - $artifactsdir/xmake.xz.run \ - xmake-v$version-runfile \ - ./scripts/get.sh __local__ -- cgit v1.3.1 From 43ac546cbd551bf06ae37a8211c8a65d9eadbb0b Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 25 Nov 2023 00:51:19 +0800 Subject: add set_author and set_maintainer --- scripts/makeself/header | 8 -------- scripts/makeself/lsm | 15 --------------- tests/plugins/pack/xmake.lua | 1 + xmake/includes/xpack/xmake.lua | 4 ++++ xmake/plugins/pack/xpack.lua | 2 ++ xmake/scripts/xpack/runself/makeself.lsm | 6 +++--- 6 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 scripts/makeself/header delete mode 100644 scripts/makeself/lsm (limited to 'scripts') diff --git a/scripts/makeself/header b/scripts/makeself/header deleted file mode 100644 index f247ee7bd..000000000 --- a/scripts/makeself/header +++ /dev/null @@ -1,8 +0,0 @@ -xmake v#xmake-version#, A cross-platform build utility based on Lua -Copyright (C) 2015-present Ruki Wang, tboox.org, xmake.io - _ - __ ___ __ __ __ _| | ______ - \ \/ / | \/ |/ _ | |/ / __ \ - > < | \__/ | /_| | < ___/ - /_/\_\_|_| |_|\__ \|_|\_\____| - by ruki, xmake.io diff --git a/scripts/makeself/lsm b/scripts/makeself/lsm deleted file mode 100644 index 012efa4a1..000000000 --- a/scripts/makeself/lsm +++ /dev/null @@ -1,15 +0,0 @@ -Begin3 -Title: xmake -Version: #xmake-version# -Description: xmake is a cross-platform build utility based on lua. - The project focuses on making development and building easier and - provides many features (e.g package, install, plugin, macro, action, option, task ...), - so that any developer can quickly pick it up and - enjoy a productivity boost when developing and building projects. -Keywords: make build -Author: ruki (waruqi@gmail.com) -Maintained-by: ruki (waruqi@gmail.com) -Original-site: https://xmake.io/ -Platform: Unix; Windows -Copying-policy: Apache-2.0 -End diff --git a/tests/plugins/pack/xmake.lua b/tests/plugins/pack/xmake.lua index 5f4be60a3..33d50b3d2 100644 --- a/tests/plugins/pack/xmake.lua +++ b/tests/plugins/pack/xmake.lua @@ -21,6 +21,7 @@ target("foo") xpack("test") set_formats("nsis", "zip", "targz", "srczip", "srctargz", "runself") set_title("hello") + set_author("ruki") set_description("A test installer.") set_homepage("https://xmake.io") set_licensefile("LICENSE.md") diff --git a/xmake/includes/xpack/xmake.lua b/xmake/includes/xpack/xmake.lua index 8572b2a87..c6ed04201 100644 --- a/xmake/includes/xpack/xmake.lua +++ b/xmake/includes/xpack/xmake.lua @@ -34,6 +34,10 @@ local apis = { "xpack.set_homepage", -- set package title "xpack.set_title", + -- set author + "xpack.set_author", + -- set maintainer, + "xpack.set_maintainer", -- set package description "xpack.set_description", -- set input kind, e.g. binary, source diff --git a/xmake/plugins/pack/xpack.lua b/xmake/plugins/pack/xpack.lua index 4bea5fb86..64e9d77dc 100644 --- a/xmake/plugins/pack/xpack.lua +++ b/xmake/plugins/pack/xpack.lua @@ -296,6 +296,8 @@ function xpack:specvars() PACKAGE_TITLE = self:title() or "", PACKAGE_DESCRIPTION = self:description() or "", PACKAGE_FILENAME = self:filename(), + PACKAGE_AUTHOR = self:get("author") or "", + PACKAGE_MAINTAINER = self:get("maintainer") or self:get("author") or "", PACKAGE_HOMEPAGE = self:get("homepage") or "", PACKAGE_COPYRIGHT = self:get("copyright") or "", PACKAGE_COMPANY = self:get("company") or "", diff --git a/xmake/scripts/xpack/runself/makeself.lsm b/xmake/scripts/xpack/runself/makeself.lsm index f71ea98c7..206c302c5 100644 --- a/xmake/scripts/xpack/runself/makeself.lsm +++ b/xmake/scripts/xpack/runself/makeself.lsm @@ -2,9 +2,9 @@ Begin3 Title: ${PACKAGE_TITLE} Version: ${PACKAGE_VERSION} Description: ${PACKAGE_DESCRIPTION} -Keywords: make build -Author: ruki (waruqi@gmail.com) -Maintained-by: ruki (waruqi@gmail.com) +Keywords: ${PACKAGE_NAME} +Author: $(PACKAGE_AUTHOR) +Maintained-by: $(PACKAGE_MAINTAINER) Original-site: ${PACKAGE_HOMEPAGE} Platform: Unix; Windows Copying-policy: ${PACKAGE_COPYRIGHT} -- cgit v1.3.1