template for next BV of org.fdroid.k9

This commit is contained in:
David Black 2013-07-01 01:54:07 +01:00
parent b2042c21c3
commit 956e71ec25
2 changed files with 68 additions and 0 deletions

View file

@ -157,6 +157,21 @@ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
rm -rf HtmlCleaner
Build Version:4.xxx-fdroid,18002,!template for next version at fea29dab,\
forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
library/project.properties,patch=packageid.patch,prebuild=./tools/build-beta && \
rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
unzip libs/htmlcleaner-2.2-all.zip && mkdir -p src/com/ && cd src/com/ && \
cp -r ../../$$Jutf7$$/src/main/java/com/beetstra . && \
tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \
rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib* ,build=\
$$MVN3$$ package -f HtmlCleaner/pom.xml && \
mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
rm -rf HtmlCleaner
# Should think about providing maintenance updates for 4.400
# K9 have their own fork of jzlib and jutf7 that won't change very often
Auto Update Mode:None

View file

@ -0,0 +1,53 @@
diff --git a/tools/build-beta b/tools/build-beta
index 8061ec9..01b0725 100755
--- a/tools/build-beta
+++ b/tools/build-beta
@@ -44,12 +44,12 @@ DIST_LOGTAG=k9
DIST_PROJ_NAME=K9
DIST_APP_NAME='\@string/app_name'
-BETA_TLD=com
-BETA_DOMAIN=fsck
-BETA_PROJECT=k9beta
-BETA_LOGTAG=k9beta
-BETA_PROJ_NAME='K9 Beta'
-BETA_APP_NAME='K-9 Beta'
+BETA_TLD=org
+BETA_DOMAIN=fdroid
+BETA_PROJECT=k9
+BETA_LOGTAG=k9
+BETA_PROJ_NAME='K9~'
+BETA_APP_NAME='K-9~'
# Nothing below here should need to be changed.
@@ -79,29 +79,5 @@ if [[ "${DIST_TLD}" != "${BETA_TLD}" ]]; then
mv ${TEST_DIR}/src/${DIST_TLD} ${TEST_DIR}/src/${BETA_TLD}
fi
-# do ant and save exit status:
-ant $@
MYEXIT=$?
-# convert back to normal project:
-if [[ "${DIST_TLD}" != "${BETA_TLD}" ]]; then
- mv ${PROJECT_DIR}/src/${BETA_TLD} ${PROJECT_DIR}/src/${DIST_TLD}
- mv ${TEST_DIR}/src/${BETA_TLD} ${TEST_DIR}/src/${DIST_TLD}
-fi
-if [[ "${DIST_DOMAIN}" != "${BETA_DOMAIN}" ]]; then
- mv ${PROJECT_DIR}/src//${DIST_TLD}/${BETA_DOMAIN} ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}
- mv ${TEST_DIR}/src//${DIST_TLD}/${BETA_DOMAIN} ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}
-fi
-if [[ "${DIST_PROJECT}" != "${BETA_PROJECT}" ]]; then
- mv ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT} ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT}
- mv ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT} ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT}
-fi
-find ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${PROJECT_DIR}/res ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${TEST_DIR}/res \
- -type f -print0 | xargs -0 perl -pi -e"s/${BETA_PACKAGE}(?=\W)/${DIST_PACKAGE}/g"
-perl -pi -e"s|LOG_TAG = \"${BETA_LOGTAG}\"|LOG_TAG = \"${DIST_LOGTAG}\"|" ${PROJECT_DIR}/src/${DIST_PATH}/${DIST_PROJ_NAME}.java
-perl -pi -e"s|${BETA_PROJ_NAME}|${DIST_PROJ_NAME}|g" ${PROJECT_DIR}/build.xml ${TEST_DIR}/build.xml
-perl -pi -e"s|${BETA_PACKAGE}|${DIST_PACKAGE}|g" ${PROJECT_DIR}/AndroidManifest.xml ${TEST_DIR}/AndroidManifest.xml
-perl -pi -e"s|${BETA_APP_NAME}|${DIST_APP_NAME}|g" ${PROJECT_DIR}/AndroidManifest.xml
-
-# exit with value from ant:
-exit ${MYEXIT}