#i93829#: changes needed for subversion migration

3 files changed, 56 insertions, 45 deletions

diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index b7df8514915e..7eac3eebfd7d 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -3,12 +3,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 "$(ZIP1TARGET)"!=""
@@ -36,9 +37,9 @@ ZIP1FLAGS*=$(ZIPFLAGS)
 zip1langdirs*=$(alllangiso)
 .ELSE           # "$(zip1generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip1langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip1langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip1langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP1DIR))} /ba:d ))
+zip1langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP1DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip1generatedlangs)"!=""
 .IF "$(ZIP1FORCEALLLANG)"!=""
@@ -122,12 +123,13 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
 .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 "$(ZIP2TARGET)"!=""
@@ -155,9 +157,9 @@ ZIP2FLAGS*=$(ZIPFLAGS)
 zip2langdirs*=$(alllangiso)
 .ELSE           # "$(zip2generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip2langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip2langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip2langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP2DIR))} /ba:d ))
+zip2langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP2DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip2generatedlangs)"!=""
 .IF "$(ZIP2FORCEALLLANG)"!=""
@@ -241,12 +243,13 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
 .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 "$(ZIP3TARGET)"!=""
@@ -274,9 +277,9 @@ ZIP3FLAGS*=$(ZIPFLAGS)
 zip3langdirs*=$(alllangiso)
 .ELSE           # "$(zip3generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip3langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip3langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip3langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP3DIR))} /ba:d ))
+zip3langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP3DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip3generatedlangs)"!=""
 .IF "$(ZIP3FORCEALLLANG)"!=""
@@ -360,12 +363,13 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
 .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 "$(ZIP4TARGET)"!=""
@@ -393,9 +397,9 @@ ZIP4FLAGS*=$(ZIPFLAGS)
 zip4langdirs*=$(alllangiso)
 .ELSE           # "$(zip4generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip4langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip4langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip4langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP4DIR))} /ba:d ))
+zip4langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP4DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip4generatedlangs)"!=""
 .IF "$(ZIP4FORCEALLLANG)"!=""
@@ -479,12 +483,13 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
 .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 "$(ZIP5TARGET)"!=""
@@ -512,9 +517,9 @@ ZIP5FLAGS*=$(ZIPFLAGS)
 zip5langdirs*=$(alllangiso)
 .ELSE           # "$(zip5generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip5langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip5langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip5langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP5DIR))} /ba:d ))
+zip5langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP5DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip5generatedlangs)"!=""
 .IF "$(ZIP5FORCEALLLANG)"!=""
@@ -598,12 +603,13 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
 .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 "$(ZIP6TARGET)"!=""
@@ -631,9 +637,9 @@ ZIP6FLAGS*=$(ZIPFLAGS)
 zip6langdirs*=$(alllangiso)
 .ELSE           # "$(zip6generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip6langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip6langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip6langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP6DIR))} /ba:d ))
+zip6langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP6DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip6generatedlangs)"!=""
 .IF "$(ZIP6FORCEALLLANG)"!=""
@@ -717,12 +723,13 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
 .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 "$(ZIP7TARGET)"!=""
@@ -750,9 +757,9 @@ ZIP7FLAGS*=$(ZIPFLAGS)
 zip7langdirs*=$(alllangiso)
 .ELSE           # "$(zip7generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip7langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip7langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip7langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP7DIR))} /ba:d ))
+zip7langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP7DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip7generatedlangs)"!=""
 .IF "$(ZIP7FORCEALLLANG)"!=""
@@ -836,12 +843,13 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
 .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 "$(ZIP8TARGET)"!=""
@@ -869,9 +877,9 @@ ZIP8FLAGS*=$(ZIPFLAGS)
 zip8langdirs*=$(alllangiso)
 .ELSE           # "$(zip8generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip8langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip8langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip8langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP8DIR))} /ba:d ))
+zip8langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP8DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip8generatedlangs)"!=""
 .IF "$(ZIP8FORCEALLLANG)"!=""
@@ -955,12 +963,13 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
 .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 "$(ZIP9TARGET)"!=""
@@ -988,9 +997,9 @@ ZIP9FLAGS*=$(ZIPFLAGS)
 zip9langdirs*=$(alllangiso)
 .ELSE           # "$(zip9generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip9langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip9langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip9langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP9DIR))} /ba:d ))
+zip9langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP9DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip9generatedlangs)"!=""
 .IF "$(ZIP9FORCEALLLANG)"!=""
@@ -1074,12 +1083,13 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
 .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 "$(ZIP10TARGET)"!=""
@@ -1107,9 +1117,9 @@ ZIP10FLAGS*=$(ZIPFLAGS)
 zip10langdirs*=$(alllangiso)
 .ELSE           # "$(zip10generatedlangs)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip10langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
+zip10langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
-zip10langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP10DIR))} /ba:d ))
+zip10langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP10DIR))} /ba:d )))
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF          # "$(zip10generatedlangs)"!=""
 .IF "$(ZIP10FORCEALLLANG)"!=""
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 36c72eebb9ed..ccdc133fca45 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -638,7 +638,7 @@ $(MISC)$/%.dpz :
 .ELSE			# "$(USE_SHELL)"!="4nt"
     $(TYPE) $(mktmp $(ZIPDEPFILES:s/\/\\/)) | $(XARGS) dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true
 .ENDIF			# "$(USE_SHELL)"!="4nt"
-    $(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" >> $@
+    $(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@
     echo zipdep_langs=$(alllangiso) >> $@
     @@-$(RM) $(ZIPDEPFILES)
 .ENDIF			# "$(nodep)"==""
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)"!=""