odk: move files out of the confusing "pack" directory to better homes

Change-Id: I46f4954ef07f60e1f7824a47f0617f8612ea9505

13 files changed, 11 insertions, 10 deletions

diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index fe60a6ba15d7..9be0fad72307 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -25,7 +25,8 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \
 # Cygwin Doxygen needs unix paths
 odk_cygwin_path = $(if $(filter WNT,$(OS)),$(shell cygpath -u $(1)),$(1))
 odk_cpp_PREFIX := $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/
-odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/log-areas.dox \
+odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/docs/cpp/main.dox \
+	$(SRCDIR)/include/sal/log-areas.dox \
 	$(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST))
 odk_cpp_DOXY_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref
 
@@ -35,7 +36,7 @@ $(eval $(call gb_CustomTarget_register_targets,odk/docs,\
 ))
 
 $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \
-		$(SRCDIR)/odk/pack/gendocu/Doxyfile \
+		$(SRCDIR)/odk/docs/cpp/Doxyfile \
 		$(gb_Module_CURRENTMAKEFILE)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
 	sed -e 's!^INPUT = %$$!INPUT = $(call odk_cygwin_path,$(odk_cpp_DOXY_INPUT))!' \
@@ -49,7 +50,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \
 $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/doxygen.log : \
 		$(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile \
 		$(SRCDIR)/include/sal/log-areas.dox \
-		$(SRCDIR)/odk/pack/gendocu/main.dox \
+		$(SRCDIR)/odk/docs/cpp/main.dox \
 		$(call gb_PackageSet_get_target,odk_headers)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
 	rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
@@ -62,15 +63,15 @@ $(eval $(call gb_CustomTarget_register_targets,odk/docs,\
 odk_idl_PREFIX := $(SRCDIR)/udkapi/ $(SRCDIR)/offapi/
 # note: generated_idl_chapter_refs.idl must be the _last_ input file!
 # otherwise spurious references to it will appear in the output
-odk_idl_DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/idl/main.dox \
+odk_idl_DOXY_INPUT := $(SRCDIR)/odk/docs/idl/main.dox \
 	$(addsuffix com,$(odk_idl_PREFIX)) \
-	$(SRCDIR)/odk/pack/gendocu/idl/generated_idl_chapter_refs.idl
+	$(SRCDIR)/odk/docs/idl/generated_idl_chapter_refs.idl
 odk_idl_DOXY_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/docs/idl)/ref
 
 # don't depend on the IDL files directly but instead on the udkapi/offapi
 # which will get rebuilt when any IDL file changes
 $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \
-		$(SRCDIR)/odk/pack/gendocu/idl/Doxyfile \
+		$(SRCDIR)/odk/docs/idl/Doxyfile \
 		$(call gb_UnoApi_get_target,udkapi) \
 		$(call gb_UnoApi_get_target,offapi) \
 		$(gb_Module_CURRENTMAKEFILE)
@@ -86,7 +87,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \
 
 $(call gb_CustomTarget_get_workdir,odk/docs)/idl/doxygen.log : \
 		$(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile \
-		$(SRCDIR)/odk/pack/gendocu/idl/main.dox
+		$(SRCDIR)/odk/docs/idl/main.dox
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
 	rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
 
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index 93527a96de3b..5527fe3332f8 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -37,8 +37,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call g
 		-d $(dir $@) \
 		-sourcepath "$(SRCDIR)/ridljar/source/unoloader$(gb_CLASSPATHSEP)$(SRCDIR)/ridljar$(gb_CLASSPATHSEP)$(SRCDIR)/jurt$(gb_CLASSPATHSEP)$(SRCDIR)/javaunohelper" \
 		-classpath $(OUTDIR)/bin/ridl.jar \
-		-linkoffline ../../common/reg $(SRCDIR)/odk/pack/gendocu/uno \
-		-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/pack/gendocu/java \
+		-linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \
+		-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
 		$(odk_JAVAPACKAGES) \
 		$(if $(JAVADOCISGJDOC),,-notimestamp) \
 		> $@
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk
index 242dd686c4fd..2a0d6e402a7c 100644
--- a/odk/CustomTarget_settings.mk
+++ b/odk/CustomTarget_settings.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/settings))
 
 $(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk))
 
-$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk
+$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/settings/dk.mk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
 	tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \
 		-e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \
diff --git a/odk/pack/gendocu/Doxyfile b/odk/docs/cpp/Doxyfile
index 26c8893d6624..26c8893d6624 100644
--- a/odk/pack/gendocu/Doxyfile
+++ b/odk/docs/cpp/Doxyfile
diff --git a/odk/pack/gendocu/main.dox b/odk/docs/cpp/main.dox
index 771fa7bcb8fd..771fa7bcb8fd 100644
--- a/odk/pack/gendocu/main.dox
+++ b/odk/docs/cpp/main.dox
diff --git a/odk/pack/gendocu/idl/Doxyfile b/odk/docs/idl/Doxyfile
index 6eead549a380..6eead549a380 100644
--- a/odk/pack/gendocu/idl/Doxyfile
+++ b/odk/docs/idl/Doxyfile
diff --git a/odk/pack/gendocu/idl/generated_idl_chapter_refs.idl b/odk/docs/idl/generated_idl_chapter_refs.idl
index 0e960edcdab6..0e960edcdab6 100644
--- a/odk/pack/gendocu/idl/generated_idl_chapter_refs.idl
+++ b/odk/docs/idl/generated_idl_chapter_refs.idl
diff --git a/odk/pack/copying/idl_chapter_refs.txt b/odk/docs/idl/idl_chapter_refs.txt
index 8569d282c7db..8569d282c7db 100644
--- a/odk/pack/copying/idl_chapter_refs.txt
+++ b/odk/docs/idl/idl_chapter_refs.txt
diff --git a/odk/pack/gendocu/idl/main.dox b/odk/docs/idl/main.dox
index b5d1d755ed0a..b5d1d755ed0a 100644
--- a/odk/pack/gendocu/idl/main.dox
+++ b/odk/docs/idl/main.dox
diff --git a/odk/pack/gendocu/idl/wikilinks.py b/odk/docs/idl/wikilinks.py
index 51490879ad7d..51490879ad7d 100644
--- a/odk/pack/gendocu/idl/wikilinks.py
+++ b/odk/docs/idl/wikilinks.py
diff --git a/odk/pack/gendocu/uno/package-list b/odk/docs/java-uno/package-list
index c3f32acd5222..c3f32acd5222 100644
--- a/odk/pack/gendocu/uno/package-list
+++ b/odk/docs/java-uno/package-list
diff --git a/odk/pack/gendocu/java/package-list b/odk/docs/java/package-list
index fecd4d4ffb35..fecd4d4ffb35 100644
--- a/odk/pack/gendocu/java/package-list
+++ b/odk/docs/java/package-list
diff --git a/odk/pack/copying/dk.mk b/odk/settings/dk.mk
index 387ef1394f85..387ef1394f85 100644
--- a/odk/pack/copying/dk.mk
+++ b/odk/settings/dk.mk