summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2010-11-25 14:10:23 -0800
committerJay Freeman (saurik) <saurik@saurik.com>2010-11-25 14:55:39 -0800
commit3adcfba70e98d8248f36c69c9c54fa6c11c8683a (patch)
tree3e9dcf8a7578f7cdd54315a0bd6e331c34690eb4
parente95a19724bdbf476044620d78068dc09aa28fff2 (diff)
Set Version: in control based on git describe --tags.
-rw-r--r--.gitignore3
-rw-r--r--control2
-rwxr-xr-xcontrol.sh5
-rw-r--r--makefile7
-rwxr-xr-xversion.sh5
5 files changed, 18 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index da9c03f..f72698b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ sysroot
MobileCydia
CydiaAppliance
_
-*.deb
+Cydia.deb
+debs
.DS_Store
*.o
diff --git a/control b/control
index bee66e4..7bf1990 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Priority: required
Section: Packaging
Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
Architecture: iphoneos-arm
-Version: 1.0.3229-1
+Version:
Replaces: com.sosiphone.addcydia
Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, sed, shell-cmds, system-cmds, uikittools (>= 1.0.3198), firmware (>= 3.2)
Pre-Depends: dpkg (>= 1.14.25-8)
diff --git a/control.sh b/control.sh
new file mode 100755
index 0000000..537cb66
--- /dev/null
+++ b/control.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+dir=$1
+dir=${dir:=_}
+sed -e "s@^\(Version:\).*@\1 $(./version.sh)@" control
+echo "Installed-Size: $(du -s "${dir}" | cut -f 1)"
diff --git a/makefile b/makefile
index b96733f..5868acc 100644
--- a/makefile
+++ b/makefile
@@ -86,12 +86,15 @@ package: MobileCydia
cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
mkdir -p _/DEBIAN
- echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
+ ./control.sh _ >_/DEBIAN/control
sudo chown -R 0 _
sudo chgrp -R 0 _
sudo chmod 6755 _/Applications/Cydia.app/MobileCydia
- $(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+ mkdir -p debs
+ ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb
+ $(dpkg) -b _ Cydia.deb
+ readlink Cydia.deb
.PHONY: all clean sign
diff --git a/version.sh b/version.sh
new file mode 100755
index 0000000..2508390
--- /dev/null
+++ b/version.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+ver=$(git describe --tags --dirty="+")
+ver=${ver#v}
+ver=${ver//-/.}
+echo "${ver}"