[ooo-build-commit] .: bin/unpack patches/dev300

[Petr Mladek]

 bin/unpack                            |    2 ++
 patches/dev300/solenv-unpack-oxt.diff |   13 ++-----------
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit 088f21b21fa768ed3c412a9b15135e2acedae5a4
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Jul 16 11:38:31 2010 +0200

    Fix ct2m extension build
    
    * bin/unpack: create ct2n dir, so applypatch add the build patches
    * patches/dev300/solenv-unpack-oxt.diff: know how to unpack the .oxt files

diff --git a/bin/unpack b/bin/unpack
index cfb8f4c..eb35112 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -907,6 +907,8 @@ if test "x$CT2N_EXTENSION" != "x"; then
     echo "Linking ConvertTextToNumber extension sources to the expected name"
     md5=`md5sum $SRCDIR/$CT2N_EXTENSION | cut -d' ' -f1`
     ln -sf $SRCDIR/$CT2N_EXTENSION $SRCDIR/$md5-$CT2N_EXTENSION || exit 1
+    # create empty module dir so bin/applyflags could force applying the build patches
+    mkdir -p $OOBUILDDIR/ct2n
 fi
 
 if test "x$WATCH_WINDOW_EXTENSION" != "x"; then
diff --git a/patches/dev300/solenv-unpack-oxt.diff b/patches/dev300/solenv-unpack-oxt.diff
index 98e5f6d..4c47f80 100644
--- a/patches/dev300/solenv-unpack-oxt.diff
+++ b/patches/dev300/solenv-unpack-oxt.diff
@@ -1,24 +1,15 @@
----
- solenv/inc/tg_ext.mk |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git solenv/inc/tg_ext.mk solenv/inc/tg_ext.mk
-index e19c712..b8f7ac2 100644
 --- solenv/inc/tg_ext.mk
 +++ solenv/inc/tg_ext.mk
 @@ -151,6 +151,12 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
      @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
      @$(RENAME) $@.$(INPATH) $@
  
-+$(MISC)/%.unpack : $(PRJ)/download/%.oxt
++$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.oxt
 +    @-$(RM) $@
-+    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).oxt)
++    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
 +    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 +    @$(RENAME) $@.$(INPATH) $@
 +
  $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
      @-$(RM) $@
  .IF "$(OS)"=="SOLARIS"
--- 
-1.7.0.1
-