do not copy files around needlessly

Change-Id: I681500bb01e13155b355c8a45b41f73e8b9faf26

13 files changed, 17 insertions, 20 deletions

diff --git a/smoketest/Zip_smoketestdoc.mk b/smoketest/Zip_smoketestdoc.mk
index a88a1c8723ea..d39e9f1f2385 100644
--- a/smoketest/Zip_smoketestdoc.mk
+++ b/smoketest/Zip_smoketestdoc.mk
@@ -27,34 +27,30 @@
 
 SMOKETESTDOC_DIR:=$(SRCDIR)/smoketest/data
 
-$(eval $(call gb_Zip_Zip,smoketestdoc,$(WORKDIR)/Zip/smoketestdoc))
+$(eval $(call gb_Zip_Zip,smoketestdoc,$(SRCDIR)/smoketest/data))
 
 $(eval $(call gb_Zip_add_commandoptions,smoketestdoc,-D))
 
 $(eval $(call gb_Zip_add_file,smoketestdoc,mimetype))
 
-$(eval $(call gb_Zip_add_file,smoketestdoc,content.xml,$(SMOKETESTDOC_DIR)/content.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,meta.xml,$(SMOKETESTDOC_DIR)/meta.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,settings.xml,$(SMOKETESTDOC_DIR)/settings.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,styles.xml,$(SMOKETESTDOC_DIR)/styles.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,content.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,meta.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,settings.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,styles.xml))
 
-$(eval $(call gb_Zip_add_file,smoketestdoc,META-INF/manifest.xml,$(SMOKETESTDOC_DIR)/manifest.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,META-INF/manifest.xml))
 
-$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/script-lc.xml,$(SMOKETESTDOC_DIR)/script-lc.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/script-lb.xml,$(SMOKETESTDOC_DIR)/script-lb.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Events.xml,$(SMOKETESTDOC_DIR)/Events.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Global.xml,$(SMOKETESTDOC_DIR)/Global.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_10er.xml,$(SMOKETESTDOC_DIR)/Test_10er.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_DB.xml,$(SMOKETESTDOC_DIR)/Test_DB.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_Ext.xml,$(SMOKETESTDOC_DIR)/Test_Ext.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/script-lc.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/script-lb.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Events.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Global.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_10er.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_DB.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_Ext.xml))
 
-$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/dialog-lc.xml,$(SMOKETESTDOC_DIR)/dialog-lc.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/dialog-lb.xml,$(SMOKETESTDOC_DIR)/dialog-lb.xml))
-$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/OptionsDlg.xml,$(SMOKETESTDOC_DIR)/OptionsDlg.xml))
-
-$(WORKDIR)/Zip/smoketestdoc/mimetype :
-	mkdir -p $(dir $@)
-	printf application/vnd.sun.xml.writer > $@
+$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/dialog-lc.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/dialog-lb.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/OptionsDlg.xml))
 
 $(call gb_Zip_get_final_target,smoketestdoc) : $(OUTDIR)/bin/smoketestdoc.sxw
 $(call gb_Zip_get_clean_target,smoketestdoc) : Clean_smoketestdoc_sxw
diff --git a/smoketest/data/Events.xml b/smoketest/data/Basic/Standard/Events.xml
index 127af2f79a70..127af2f79a70 100644
--- a/smoketest/data/Events.xml
+++ b/smoketest/data/Basic/Standard/Events.xml
diff --git a/smoketest/data/Global.xml b/smoketest/data/Basic/Standard/Global.xml
index 64e6a3d1bf4e..64e6a3d1bf4e 100644
--- a/smoketest/data/Global.xml
+++ b/smoketest/data/Basic/Standard/Global.xml
diff --git a/smoketest/data/Test_10er.xml b/smoketest/data/Basic/Standard/Test_10er.xml
index bd774b47b764..bd774b47b764 100644
--- a/smoketest/data/Test_10er.xml
+++ b/smoketest/data/Basic/Standard/Test_10er.xml
diff --git a/smoketest/data/Test_DB.xml b/smoketest/data/Basic/Standard/Test_DB.xml
index 4572f3d337e9..4572f3d337e9 100644
--- a/smoketest/data/Test_DB.xml
+++ b/smoketest/data/Basic/Standard/Test_DB.xml
diff --git a/smoketest/data/Test_Ext.xml b/smoketest/data/Basic/Standard/Test_Ext.xml
index 06639d4bb61a..06639d4bb61a 100644
--- a/smoketest/data/Test_Ext.xml
+++ b/smoketest/data/Basic/Standard/Test_Ext.xml
diff --git a/smoketest/data/script-lb.xml b/smoketest/data/Basic/Standard/script-lb.xml
index e91b91fdacd3..e91b91fdacd3 100644
--- a/smoketest/data/script-lb.xml
+++ b/smoketest/data/Basic/Standard/script-lb.xml
diff --git a/smoketest/data/script-lc.xml b/smoketest/data/Basic/script-lc.xml
index 9d2b85bcae9f..9d2b85bcae9f 100644
--- a/smoketest/data/script-lc.xml
+++ b/smoketest/data/Basic/script-lc.xml
diff --git a/smoketest/data/OptionsDlg.xml b/smoketest/data/Dialogs/Standard/OptionsDlg.xml
index d3217c75d396..d3217c75d396 100644
--- a/smoketest/data/OptionsDlg.xml
+++ b/smoketest/data/Dialogs/Standard/OptionsDlg.xml
diff --git a/smoketest/data/dialog-lb.xml b/smoketest/data/Dialogs/Standard/dialog-lb.xml
index a03595567147..a03595567147 100644
--- a/smoketest/data/dialog-lb.xml
+++ b/smoketest/data/Dialogs/Standard/dialog-lb.xml
diff --git a/smoketest/data/dialog-lc.xml b/smoketest/data/Dialogs/dialog-lc.xml
index 9d2b85bcae9f..9d2b85bcae9f 100644
--- a/smoketest/data/dialog-lc.xml
+++ b/smoketest/data/Dialogs/dialog-lc.xml
diff --git a/smoketest/data/manifest.xml b/smoketest/data/META-INF/manifest.xml
index f515ffa843fb..f515ffa843fb 100644
--- a/smoketest/data/manifest.xml
+++ b/smoketest/data/META-INF/manifest.xml
diff --git a/smoketest/data/mimetype b/smoketest/data/mimetype
new file mode 100644
index 000000000000..9df49bfcdb98
--- /dev/null
+++ b/smoketest/data/mimetype
@@ -0,0 +1 @@
+application/vnd.sun.xml.writer
\ No newline at end of file