svn commit: r815852 - in /ofbiz/trunk: ./ .gitignore debian/ debian/rules

[doogie-3]

Author: doogie
Date: Wed Sep 16 15:59:44 2009
New Revision: 815852

URL: http://svn.apache.org/viewvc?rev=815852&view=rev
Log:
Add support for making the orig.tar.gz when using git locally.

Modified:
    ofbiz/trunk/   (props changed)
    ofbiz/trunk/.gitignore
    ofbiz/trunk/debian/   (props changed)
    ofbiz/trunk/debian/rules

Propchange: ofbiz/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 16 15:59:44 2009
@@ -7,3 +7,4 @@
 *.time
 .settings
 .project
+changelog

Modified: ofbiz/trunk/.gitignore
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.gitignore?rev=815852&r1=815851&r2=815852&view=diff
==============================================================================
--- ofbiz/trunk/.gitignore (original)
+++ ofbiz/trunk/.gitignore Wed Sep 16 15:59:44 2009
@@ -42,6 +42,7 @@
 specialpurpose/projectmgr/build/
 specialpurpose/webpos/build/
 ofbiz.jar
+changelog
 runtime/svninfo.ftl
 runtime/logs/access_log.*
 runtime/logs/*.log*
@@ -66,6 +67,7 @@
 debian/ofbiz.substvars
 debian/ofbiz/
 debian/stamps/
+debian/orig-work
 
 
 

Propchange: ofbiz/trunk/debian/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 16 15:59:44 2009
@@ -17,3 +17,4 @@
 ofbiz-framework.substvars
 stamps
 copyright
+orig-work

Modified: ofbiz/trunk/debian/rules
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/rules?rev=815852&r1=815851&r2=815852&view=diff
==============================================================================
--- ofbiz/trunk/debian/rules (original)
+++ ofbiz/trunk/debian/rules Wed Sep 16 15:59:44 2009
@@ -44,18 +44,28 @@
 
 make-orig:
  set -ex; \
- rm -rf ../orig; \
+ process_orig_dir() { \
+ wait; \
+ cp -a $$1/changelog changelog; \
+ mv $$1/changelog "$$1/ofbiz-$$2/changelog"; \
+ tar -C $$1 -c "ofbiz-$$2" | gzip -9 > "$$1/ofbiz_$$2.orig.tar.gz"; \
+ mv "$$1/ofbiz_$$2.orig.tar.gz" ..; \
+ rm -rf $$1; \
+ }; \
+ if [ -d .git ]; then \
+ rm -rf debian/orig-work; mkdir -p debian/orig-work/ofbiz-$(UPSTREAM_VERSION); \
+ treeish=`git svn find-rev r$(UPSTREAM_VERSION)`;\
+ git svn log -v -r "$(UPSTREAM_VERSION):0" > debian/orig-work/changelog & \
+ (cd debian/orig-work; git clone -n ../.. ofbiz-$(UPSTREAM_VERSION); cd ofbiz-$(UPSTREAM_VERSION); git checkout $$treeish; rm -rf .git); \
+ process_orig_dir debian/orig-work "$(UPSTREAM_VERSION)"; \
+ exit; \
+ fi; \
  set -- `(svk info . 2>/dev/null || true) | awk -F '[ ,]+' '/^(Depot Path|Mirrored From): /{print $$3, $$5}'`;\
  if [ "$$1" ]; then \
- mkdir -p ../orig; \
+ rm -rf ../orig; mkdir -p ../orig; \
  svk log -v > ../orig/changelog & \
- svk co --export "$$1" "../orig/ofbiz-$$3"; \
- wait; \
- cp -a ../orig/changelog changelog; \
- mv ../orig/changelog "../orig/ofbiz-$$3/changelog"; \
- tar -C ../orig -c "ofbiz-$$3" | gzip -9 > "../orig/ofbiz_$$3.orig.tar.gz"; \
- mv "../orig/ofbiz_$$3.orig.tar.gz" ..; \
- rm -rf ../orig; \
+ svk co --export "$$1" "../orig/ofbiz-$$3" & \
+ process_orig_dir ../orig $$3; \
  fi \
 
 clean-debian: