diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-14 04:46:41 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-14 04:46:41 -0600 |
| commit | 9221c1d06e9185b734d58c155764ed24fcfc48ed (patch) | |
| tree | 9056cc955d3ec53a16f61429a1092d0a21ecdd73 | |
| parent | 698abccc3b864bbd4e2707de697fa185e0338465 (diff) | |
| download | abuild-9221c1d06e9185b734d58c155764ed24fcfc48ed.tar.gz abuild-9221c1d06e9185b734d58c155764ed24fcfc48ed.tar.bz2 abuild-9221c1d06e9185b734d58c155764ed24fcfc48ed.tar.xz abuild-9221c1d06e9185b734d58c155764ed24fcfc48ed.zip | |
newapkbuild: Drastically modernise output APKBUILD file
| -rw-r--r-- | newapkbuild.in | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/newapkbuild.in b/newapkbuild.in index 85f838f..dbcef14 100644 --- a/newapkbuild.in +++ b/newapkbuild.in @@ -68,13 +68,9 @@ build_cmake() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \\ -DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\ -DCMAKE_C_FLAGS="\$CFLAGS" \\ - \${CMAKE_CROSSOPTS} + \${CMAKE_CROSSOPTS} \\ + . make -} - -check() { - cd "\$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest __EOF__ } @@ -115,6 +111,12 @@ check_make() { __EOF__ } +check_cmake() { + cat >>APKBUILD<<__EOF__ + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +__EOF__ +} + check_python() { cat >>APKBUILD<<__EOF__ python3 setup.py test @@ -193,7 +195,7 @@ newaport() { python) makedepends="python3-dev";; cmake) makedepends="cmake";; meson) makedepends="meson";; - *) makedepends="\$depends_dev";; + *) makedepends="";; esac # Replace pkgver in $source @@ -226,9 +228,15 @@ url="$url" arch="all" license="$license" depends="$depends" -depends_dev="" makedepends="$makedepends" +__EOF__ + if [ -n "$install" ]; then + cat >>APKBUILD<<__EOF__ install="$install" +__EOF__ + fi + + cat >>APKBUILD<<__EOF__ subpackages="\$pkgname-dev \$pkgname-doc" source="$source" __EOF__ @@ -241,7 +249,12 @@ __EOF__ builddir=$(echo ${i#*/} | sed "s/$pv/\$pkgver/g") fi done - printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD + if [ -n "$sdir" ] && [ "$sdir" = "src/$pkgname-$pv" ]; then + # No builddir needed. + : + else + printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD + fi # Subpackage -dev is usually required only for C/C++. Since depends_dev # confuses a lot people, remove it if there's no .h or .hpp file. @@ -271,7 +284,6 @@ __EOF__ # Create build() function cat >>APKBUILD<<__EOF__ build() { - cd "\$builddir" __EOF__ case "$buildtype" in @@ -287,6 +299,8 @@ __EOF__ build_perl;; python) build_python;; + *) + printf '# Add build instructions here.' >> APKBUILD esac cat >>APKBUILD<<__EOF__ @@ -297,14 +311,17 @@ __EOF__ # Create check() function cat >>APKBUILD<<__EOF__ check() { - cd "\$builddir" __EOF__ case "$buildtype" in - make|cmake|autotools|perl) + make|autotools|perl) check_make;; + cmake) + check_cmake;; python) check_python;; + *) + printf '# Add test instructions here.' >> APKBUILD esac cat >>APKBUILD<<__EOF__ @@ -315,7 +332,6 @@ __EOF__ # Create package() function cat >>APKBUILD<<__EOF__ package() { - cd "\$builddir" __EOF__ case "$buildtype" in @@ -329,6 +345,8 @@ __EOF__ package_perl;; python) package_python;; + *) + printf '# Add packaging instructions here.' >> APKBUILD esac if [ -n "$cpinitd" ]; then |