move global headers script

* ignores (for now) modules:
  - sal
* these might or might not consider themselves too special for their own
  good and break by the move
* these modules use Package_<module>_odk_headers.mk instead and stay
  untouched:
  - cppu
  - cppuhelper
  - sal
  - salhelper
* these modules have an inc/ subdir, but no Package_inc.mk
  - accessibility
  - autodoc
  - bridges
  - idlc
  - pyuno
  - svgio
  - unodevtools
  - xmlsecurity
  this should not hurt the move
* these folders are in solver/ with generated headers:
  - oovbaapi
  - offapi
  - udkapi
  - officecfg
  - systools
  - external
  - oox
  - svx (sdi)
  - sfx2 (sdi)
  - writerfilter
* these likely can be cleaned up still after the move:
  - dbaccess
  - npsdk
  - sd
  - helpcompiler
* should work with xmlscript after commit
  f4ebb99de6e93f6d38e7b0486d66e99a196b1f6e
* fixes/hotfixes some other insanities that would break on the move

Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a

2 files changed, 51 insertions, 1 deletions

diff --git a/bin/moveglobalheaders.sh b/bin/moveglobalheaders.sh
new file mode 100755
index 000000000000..e852a34534b3
--- /dev/null
+++ b/bin/moveglobalheaders.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+topdirs=`find . -mindepth 1 -maxdepth 1 -type d -not -name sal`
+mkdir -p include/
+for dir in $topdirs
+do
+    dir=`echo "$dir"| sed -e 's/^..//'`
+    if test -d $dir/inc/$dir
+    then
+        if test -f $dir/Package_inc.mk
+        then
+            if test -f $dir/Module_$dir.mk
+            then
+                git mv $dir/inc/$dir include/$dir
+                git rm $dir/Package_inc.mk
+                grep -v Package_inc $dir/Module_$dir.mk > $dir/Module_dir.mk.new
+                mv -f $dir/Module_dir.mk.new $dir/Module_$dir.mk
+                git add $dir/Module_$dir.mk
+            else
+                echo "WARN: no $dir/Module_$dir.mk"
+            fi
+        else
+            echo "WARN: no file $dir/Package_inc.mk"
+        fi
+    fi
+done
+#grep -v Package_inc.mk sal/CustomTarget_sal_allheaders.mk > sal/CustomTarget_sal_allheaders.mk.new
+#mv sal/CustomTarget_sal_allheaders.mk.new sal/CustomTarget_sal_allheaders.mk
+#git add sal/CustomTarget_sal_allheaders.mk
+
+# we like to be special ...
+sed -ie 's/\/svtools\/inc\/svtools/\/include\/svtools\//' svtools/Library_svt.mk
+sed -ie 's/\/sfx2\/inc\/sfx2/\/include\/sfx2\//' sfx2/Library_sfx.mk
+sed -ie 's/\/sfx2\/inc\/sfx2/\/include\/sfx2\//' sfx2/Library_qstart_gtk.mk
+git add svtools/Library_svt.mk sfx2/Library_sfx.mk sfx2/Library_qstart_gtk.mk
+
+# urgh
+sed -ie 's/\.\.\/svx\//svx\//' svx/source/svdraw/svdoashp.cxx
+git add svx/source/svdraw/svdoashp.cxx
+
+# this one is making me speechless ...
+echo "// ah, yes: thats a sane thing to do -- deliver the same header _twice_ with different names" > include/toolkit/unohlp.hxx
+echo "// please kill me (this file)!" >> include/toolkit/unohlp.hxx
+echo "#include <toolkit/helper/vclunohelper.hxx>" >> include/toolkit/unohlp.hxx
+git add include/toolkit/unohlp.hxx
diff --git a/configure.ac b/configure.ac
index 6b844d6a304b..33e67d0a0f5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3400,7 +3400,7 @@ AC_SUBST(PRODUCTVERSION)
 # determine CPU, CPUNAME, GUI, GUIBASE, ...
 #
 LIB64="lib"
-SOLARINC=
+SOLARINC="-I${SRC_ROOT}/include"
 SDKDIR="sdk"
 
 case "$host_os" in