#82295# now using only OOo-conform tools for building

2 files changed, 29 insertions, 50 deletions

diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 68d55d8d4f5e..68b590275529 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -7,8 +7,11 @@ TARGET=copying
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
 
+IDLDIRLIST={$(subst,/,$/ $(shell $(FIND) $(IDLOUT) -type d -print))}
+
 DIRLIST = \
-    $(DESTDIREXAMPLES)$/officeclient 	
+    $(DESTDIREXAMPLES)$/officeclient 	\
+    {$(subst,$(IDLOUT),$(DESTDIRIDL) $(IDLDIRLIST))}
 
 EXAMPLESLIST= \
     $(DESTDIREXAMPLES)$/officeclient$/officeclient.cxx \
@@ -17,58 +20,34 @@ EXAMPLESLIST= \
     $(DESTDIREXAMPLES)$/officeclient$/Makefile         \
     $(DESTDIREXAMPLES)$/officeclient$/exports.dxp      \
 
+IDLLIST={$(subst,/,$/ $(shell $(FIND) $(IDLOUT) -type f -print))}
+DESTIDLLIST={$(subst,$(IDLOUT),$(DESTDIRIDL) $(IDLLIST))}
 
-.IF "$(GUI)"=="UNX"
-all : deliver $(DIRLIST) $(EXAMPLESLIST) convertit
-.ELSE
-all : deliver $(DIRLIST) $(EXAMPLESLIST) 
-.ENDIF
+all : 	\
+    remove_dk \
+    $(DIRLIST) \
+    $(EXAMPLESLIST) \
+    $(DESTIDLLIST)  \
+    $(DESTDIRBIN)$/applicat.rdb  \
+    $(DESTDIR)$/settings$/dk.mk
 
-$(DIRLIST) : 
+$(DIRLIST) :
      -$(MKDIRHIER) 	$@
 
-$(DESTDIREXAMPLES)$/officeclient$/% : $(PRJ)$/examples$/cpp$/officeclient$/% $(DIRLIST) $(BIN)$/$(UDKNAME).zip
-    $(GNUCOPY) $(PRJ)$/examples$/cpp$/officeclient$/$(@:f) $@
-    $(REMOVE_READONLY) $@
-
-deliver : 
-#------------------------------------------------------------------------------------
-#       R D B  F I L E S
-#------------------------------------------------------------------------------------
-    +-$(RM)  $(DESTDIRBIN)$/udkapi.rdb >& NUL
-    +-$(MY_COPY)  $(BINOUT)$/applicat.rdb $(DESTDIRBIN)
-# ------------------------------------------------------------------------------------
-#       I D L files
-# ------------------------------------------------------------------------------------
-    +-$(MY_COPY_RECURSIVE) $(IDLOUT) $(DESTDIR)
-#----------------------------------------------------------------------
-#       S E T T I N G S
-#----------------------------------------------------------------------
-    +-$(RM) /f $(DESTDIR)$/settings$/dk.mk
-    $(MY_COPY) $(PRJ)$/util$/dk.mk $(DESTDIR)$/settings
-    $(REMOVE_READONLY) $(DESTDIR)$/settings$/dk.mk
+$(DESTDIREXAMPLES)$/% : $(PRJ)$/examples$/cpp$/% $(DIRLIST) $(BIN)$/$(UDKNAME).zip
+    +-rm -f $@ >& $(NULLDEV)
+    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@
 
+$(DESTDIRBIN)$/applicat.rdb : $(BINOUT)$/applicat.rdb 
+    $(GNUCOPY) $(BINOUT)$/applicat.rdb $@
 
-MKFILES_CONVERT=$(shell $(FIND) . -name "*.mk" -print)
-CXFILES_CONVERT=$(shell $(FIND) . -name "*.c*" -print)
-HXFILES_CONVERT=$(shell $(FIND) . -name "*.h*" -print)
-.IF "$(GUI)"=="UNX"
-convertit: rwit dos2unx roit
+$(DESTDIR)$/settings$/dk.mk : $(PRJ)$/util$/dk.mk
+    +-rm -f $@ >& $(NULLDEV)
+    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/util$/dk.mk $(MY_TEXTCOPY_TARGETPRE) $@
 
-rwit .SETDIR=$(DESTDIR):
-    +echo rwit
-    +-chmod 666 $(foreach,file,$(MKFILES_CONVERT) $(file))
-    +-chmod 666 $(foreach,file,$(CXFILES_CONVERT) $(file))
-    +-chmod 666 $(foreach,file,$(HXFILES_CONVERT) $(file))
-dos2unx .SETDIR=$(DESTDIR):
-    +echo dos2unx
-    +-any2all $(foreach,file,$(MKFILES_CONVERT) $(file)) >$(NULLDEV)
-    +-any2all $(foreach,file,$(CXFILES_CONVERT) $(file)) >$(NULLDEV)
-    +-any2all $(foreach,file,$(HXFILES_CONVERT) $(file)) >$(NULLDEV)
-roit .SETDIR=$(DESTDIR):
-    +echo roit
-    +-chmod 444 $(foreach,file,$(MKFILES_CONVERT) $(file))
-    +-chmod 444 $(foreach,file,$(CXFILES_CONVERT) $(file))
-    +-chmod 444 $(foreach,file,$(HXFILES_CONVERT) $(file))
-.ENDIF
+$(DESTDIRIDL)$/% : $(IDLOUT)$/%
+    +-rm -f $@
+    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@
 
+remove_dk : 
+    +-$(RM)  $(DESTDIRBIN)$/udkapi.rdb >& $(NULLDEV)
diff --git a/odk/pack/unzip_udk/makefile.mk b/odk/pack/unzip_udk/makefile.mk
index 406f0dff4db2..2301c1d568bb 100644
--- a/odk/pack/unzip_udk/makefile.mk
+++ b/odk/pack/unzip_udk/makefile.mk
@@ -30,8 +30,8 @@ all: ..$/misc$/deltree.txt
 .IF "$(GUI)"=="WNT"
     unzip -q -d . $(UDKNAME)
 .ELSE
-    gzip -df $(UDKNAME).tar.gz
-    tar -xvf $(UDKNAME).tar
+    gzip -df < $(UDKNAME).tar.gz | tar -xvf -
 .ENDIF
     +-$(RENAME) $(UDKNAME) 		$(ODKNAME)
+    +rm -f $(ODKNAME)$/settings$/dk.mk
     touch ..$/misc$/deltree.txt