Skip to content

Commit

Permalink
refactor: replace deb directory with target/deb
Browse files Browse the repository at this point in the history
  • Loading branch information
iahmadgad committed Dec 11, 2024
1 parent 0cd75ed commit 7121267
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
*~
deb/


# Added by cargo

Expand Down
2 changes: 1 addition & 1 deletion dev/deb
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ for arch in $archs; do
fi
just deb-manifest $arch
echo "Building termux deb package for architecture: $arch..."
termux-create-package "deb/manifests/${arch}.json"
termux-create-package "target/deb/manifests/${arch}.json"
done
4 changes: 2 additions & 2 deletions dev/deb-manifest
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ if [ -z "$archs" ]; then
exit 1
fi

! [ -d deb/manifests ] && mkdir -p deb/manifests
! [ -d target/deb/manifests ] && mkdir -p target/deb/manifests

for arch in $archs; do
if [ -z "${targets[$arch]}" ]; then
Expand All @@ -103,5 +103,5 @@ for arch in $archs; do
echo "Building deb manifest for arch: $arch"
yq ".control.Depends = \"$(echo $deps | sed 's/ /, /g')\"| .control.Architecture = \"${arch}\" |\
.data_files.\"bin/termux-clock\".source = \"target/$([[ "${targets[$arch]}" != "$NATIVE_TARGET" ]] && echo "${targets[$arch]}/")release/termux-clock\" |\
.control.Version = \"`just fetch-version`\"" pkg.json > "deb/manifests/${arch}.json"
.control.Version = \"`just fetch-version`\"" pkg.json > "target/deb/manifests/${arch}.json"
done
6 changes: 3 additions & 3 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install: install-termux-deps

# Install as termux deb package with apt, installed binary will be stored in: `/data/data/com.termux/files/usr/bin/`
install-deb: deb-native
apt install "./deb/packages/termux-clock_`just fetch-version`_{{ arch() }}.deb"
apt install "./target/deb/packages/termux-clock_`just fetch-version`_{{ arch() }}.deb"

# Cross build for android targets
cross-build +ARGS:
Expand All @@ -22,7 +22,7 @@ cross-build +ARGS:
cross-build-all:
dev/cross-build --all

# Build termux deb packages. Built packages are stored in: `deb/packages/`
# Build termux deb packages. Built packages are stored in: `target/deb/packages/`
deb +ARGS:
dev/deb {{ARGS}}

Expand Down Expand Up @@ -51,7 +51,7 @@ bump-version *ARGS:
install-termux-deps:
pkg install $TERMUX_DEPS

# Generate termux deb packages manifests. Generated manifests are stored in: `deb/manifests/`
# Generate termux deb packages manifests. Generated manifests are stored in: `target/deb/manifests/`
deb-manifest +ARGS:
dev/deb-manifest {{ARGS}} --deps "$TERMUX_DEPS"

Expand Down
2 changes: 1 addition & 1 deletion pkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
"source": "LICENSE"
}
},
"deb_dir": "deb/packages"
"deb_dir": "target/deb/packages"
}

0 comments on commit 7121267

Please sign in to comment.