MWS_SRX644: migrate branch mws_srx644 -> HEAD

1 files changed, 69 insertions, 51 deletions

diff --git a/odk/pack/unzip_udk/makefile.mk b/odk/pack/unzip_udk/makefile.mk
index 8710b0d910bb..44982517d053 100644
--- a/odk/pack/unzip_udk/makefile.mk
+++ b/odk/pack/unzip_udk/makefile.mk
@@ -1,3 +1,65 @@
+#*************************************************************************
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.11 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-26 13:40:11 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
 PRJ=..$/..
 PRJNAME=odk
 TARGET=unzip_udk
@@ -7,58 +69,14 @@ TARGET=unzip_udk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
-UDKPATH=$(UDKZIPPATH)$/$(UDKZIPPREFIX).zip
-ODKDOCPATH=$(UDKZIPPATH)$/$(ODKDOCNAME).zip
-.ELSE
-UDKPATH=$(UDKZIPPATH)$/$(UDKZIPPREFIX).tar.gz
-ODKDOCPATH=$(UDKZIPPATH)$/$(ODKDOCNAME).tar.gz
-.ENDIF
-
-
 all: ..$/misc$/deltree.txt
 
-..$/misc$/deltree.txt .SETDIR=$(OUT)$/bin : $(UDKPATH) ..$/..$/pack$/unzip_udk$/deltree.txt
-# first clean everything
-.IF "$(BUILD_SOSL)"==""
-    +-$(MY_DELETE_RECURSIVE) $(ODKNAME) >& $(NULLDEV)
-.ELSE
+..$/misc$/deltree.txt .SETDIR=$(OUT)$/bin : $(PRJ)$/pack$/unzip_udk$/deltree.txt
     +-$(MY_DELETE_RECURSIVE) $(PRODUCT_NAME) >& $(NULLDEV)
-.ENDIF
-    +-$(MY_DELETE_RECURSIVE) $(UDKNAME) >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(UDKZIPPREFIX).zip >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(UDKZIPPREFIX).tar.gz >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(UDKZIPPREFIX).tar >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).zip >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).tar.gz >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).tar >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(ODKNAME).zip >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(ODKNAME).tar.gz >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(ODKNAME).tar >& $(NULLDEV)
-.IF "$(GUI)"=="WNT"
-    $(GNUCOPY) -p $(UDKPATH) $(UDKZIPPREFIX).zip
-    $(GNUCOPY) -p $(ODKDOCPATH) $(ODKDOCNAME).zip
-    unzip -q -d . $(UDKZIPPREFIX)
-    +-$(RENAME) $(UDKNAME) $(ODKNAME)
-    unzip -q -d . $(ODKDOCNAME).zip
-.ELSE
-    $(GNUCOPY) -p $(UDKPATH) .
-    $(GNUCOPY) -p $(ODKDOCPATH) .
-    gzip -df < $(UDKZIPPREFIX).tar.gz | tar -xvf -
-    +-$(RENAME) $(UDKNAME) $(ODKNAME)
-    gzip -df < $(ODKDOCNAME).tar.gz | tar -xvf -
-.ENDIF
-    +-$(MY_DELETE_RECURSIVE) $(ODKNAME)$/settings$/dk.mk
-    +-$(MY_DELETE_RECURSIVE) $(ODKNAME)$/docs$/basic
-    +-$(MY_DELETE_RECURSIVE) $(ODKNAME)$/docs$/common$/man
-.IF "$(BUILD_SOSL)"!=""
-# for OpenOffice build rename to PRODUCT_NAME
-    +-$(RENAME) $(ODKNAME) $(PRODUCT_NAME)
-.ENDIF
-    +-$(MY_DELETE_RECURSIVE) $(UDKZIPPREFIX).zip >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(UDKZIPPREFIX).tar.gz >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(UDKZIPPREFIX).tar >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).zip >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).tar.gz >& $(NULLDEV)
-    +-$(MY_DELETE_RECURSIVE) $(ODKDOCNAME).tar >& $(NULLDEV)
+    +-rm -f $(PRODUCT_NAME).zip >& $(NULLDEV)
+    +-rm -f $(PRODUCT_NAME).tar.gz >& $(NULLDEV)
+    +-rm -f $(PRODUCT_NAME).tar >& $(NULLDEV)
+    +-rm -f $(DIR_CREATE_FLAG) >& $(NULLDEV)
+    +-rm -f $(DEVGUIDE_DOCU_FLAG) >& $(NULLDEV)
+    +-rm -f $(DEVGUIDE_SAMPLES_FLAG) >& $(NULLDEV)
     +@echo "" > ..$/misc$/deltree.txt