summaryrefslogtreecommitdiff
path: root/solenv/inc/tg_zip.mk
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2008-09-19 10:03:08 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2008-09-19 10:03:08 +0000
commitf3df1a08b77896d41f6393c81ea6a533f763291b (patch)
treeb930d0e83b7abaadf804e55b73efec71cdd61ea0 /solenv/inc/tg_zip.mk
parent9f1ad35159614b131823153b073c7e25491eb80d (diff)
#i93829#: changes needed for subversion migration
Diffstat (limited to 'solenv/inc/tg_zip.mk')
-rw-r--r--solenv/inc/tg_zip.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index 38bdef587bc8..381841539d8c 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -35,12 +35,13 @@
.IF "$(GUI)"=="WNT"
command_seperator=&&
#command_seperator=^
-avoid_cvs_dir=-x "*CVS*"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
.ELSE
command_seperator=;
-avoid_cvs_dir=-x "*CVS*"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
+
.ENDIF
.IF "$(ZIP$(TNR)TARGET)"!=""
@@ -68,9 +69,9 @@ ZIP$(TNR)FLAGS*=$(ZIPFLAGS)
zip$(TNR)langdirs*=$(alllangiso)
.ELSE # "$(zip$(TNR)generatedlangs)"!=""
.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip$(TNR)langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip$(TNR)langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
.ELSE # "$(GUI)"=="UNX"
-zip$(TNR)langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP$(TNR)DIR))} /ba:d ))
+zip$(TNR)langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP$(TNR)DIR))} /ba:d )))
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(zip$(TNR)generatedlangs)"!=""
.IF "$(ZIP$(TNR)FORCEALLLANG)"!=""