goodbye linkoo.. you have served well

This commit:
- removes linkoo and --disable-linkoo option
- removes 'dev-update' make target
- creates --disable-ooenv option
- removes LD_LIBRARY_PATH and PATH settings in ooenv

Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480

Makefile.in

@@ -271,7 +271,6 @@ dev-install: build
 ifeq ($(OS_FOR_BUILD),WNT)
 	cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS)
 else
-ifeq ($(DISABLE_LINKOO),TRUE)
 	@ooinstall $(DEVINSTALLDIR)/opt
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
 	@macosx-codesign-app-bundle $(DEVINSTALLDIR)/opt/LibreOffice.app
@@ -279,9 +278,6 @@ endif
 ifneq ($(OS),MACOSX)
 	@install-gdb-printers -L
 endif
-else
-	@ooinstall -l $(DEVINSTALLDIR)/opt
-endif
 endif
 	@rm -f $(BUILDDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(BUILDDIR)/install
 	@echo
@@ -305,14 +301,6 @@ endif
 dev-install-nocheck: build-nocheck
 	$(MAKE) dev-install -o build
 
-# FIXME: shouldn't linkoo be BUILDDIR vs SRCDIR aware ?
-dev-update:
-ifeq ($(DISABLE_LINKOO),TRUE)
-	@linkoo --copy $(DEVINSTALLDIR)/opt $(SRCDIR)
-else
-	@linkoo $(DEVINSTALLDIR)/opt $(SRCDIR)
-endif
-
 install-tb:
 	@rm -rf $(DEVINSTALLDIR)
 	@mkdir $(DEVINSTALLDIR)

README.cross

@@ -193,11 +193,6 @@ http://www.winehq.org/docs/wineusr-guide/environment-variables, and add
 Z:\tmp\LibO-Dev_4.1.0.0.alpha0_Win_x86_archive/LOdev\ 4.1\URE\bin
 to "Path" in My Computer->HKEY_CURRENT_USER->Environment.
 
-Then run linkoo, so that when you rebuild something, you can directly see the
-changes the next time you run it:
-
-solenv/bin/linkoo '/tmp/LibO-Dev_4.1.0.0.alpha0_Win_x86_archive/LOdev\ 4.1' <your_clone_dir>
-
 And start debugging:
 
 $ winedbg soffice.bin
@@ -422,7 +417,6 @@ CC=<path-to-arm-linux-gnueabihf-gcc> --sysroot=<path-to-raspbian_rootfs>
 CXX=<path-to-arm-linux-gnueabihf-g++> --sysroot=<path-to-raspbian_rootfs>
 --build=x86_64-unknown-linux-gnu
 --host=arm-unknown-linux-gnueabihf
---disable-linkoo
 --without-doxygen
 --disable-gnome-vfs
 --enable-python=system

config_host.mk.in

@@ -95,7 +95,6 @@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_EXPORT=@DISABLE_EXPORT@
-export DISABLE_LINKOO=@DISABLE_LINKOO@
 export DISABLE_NEON=@DISABLE_NEON@
 export DISABLE_OPENSSL=@DISABLE_OPENSSL@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
@@ -145,6 +144,7 @@ export ENABLE_MARIADBC=@ENABLE_MARIADBC@
 export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@
 export ENABLE_NPAPI_INTO_BROWSER=@ENABLE_NPAPI_INTO_BROWSER@
 export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
+export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL=@ENABLE_OPENGL@
 export ENABLE_OPENCL=@ENABLE_OPENCL@
 export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@

configure.ac

@@ -848,9 +848,9 @@ AC_ARG_ENABLE(compiler-plugins,
         [Enable compiler plugins that will perform additional checks during
          building. Enabled automatically by --enable-dbgutil.]))
 
-AC_ARG_ENABLE(linkoo,
-    AS_HELP_STRING([--disable-linkoo],
-        [Disable linkoo for the smoketest installation.]))
+AC_ARG_ENABLE(ooenv,
+    AS_HELP_STRING([--disable-ooenv],
+        [Disable ooenv for the instdir installation.]))
 
 AC_ARG_ENABLE(lto,
     AS_HELP_STRING([--enable-lto],
@@ -4601,21 +4601,18 @@ else
 fi
 AC_SUBST(ASSERT_ALWAYS_ABORT)
 
-dnl Determine whether to use linkoo for the smoketest installation
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use linkoo for the smoketest installation])
-if test $_os = Darwin; then
-    enable_linkoo=no
-fi
-
-if test "$enable_linkoo" = "no"; then
-    DISABLE_LINKOO="TRUE"
-    AC_MSG_RESULT([no])
-else
-    DISABLE_LINKOO=
-    AC_MSG_RESULT([yes])
+# Determine whether to use ooenv for the instdir installation
+# ===================================================================
+if test $_os != "WINNT" -a $_os != "Darwin"; then
+    AC_MSG_CHECKING([whether to use ooenv for the instdir installation])
+    if test "$enable_ooenv" = "no"; then
+        AC_MSG_RESULT([no])
+    else
+        ENABLE_OOENV="TRUE"
+        AC_MSG_RESULT([yes])
+    fi
 fi
-AC_SUBST(DISABLE_LINKOO)
+AC_SUBST(ENABLE_OOENV)
 
 if test "$enable_headless" = "yes"; then
     # be sure to do not mess with uneeded stuff

instsetoo_native/CustomTarget_setup.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup))
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
 	$(call gb_Helper_get_rcfile,bootstrap) \
 	$(call gb_Helper_get_rcfile,fundamental) \
-	ooenv \
+	$(if $(ENABLE_OOENV),ooenv) \
 	$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \
 	$(call gb_Helper_get_rcfile,uno) \
 	$(call gb_Helper_get_rcfile,version) \
@@ -69,11 +69,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
-		echo 'java_path=`$(gb_INSTROOT)/ure/bin/javaldx 2>/dev/null`' && \
-		echo 'export LD_LIBRARY_PATH="$(gb_INSTROOT)/program:$$java_path$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"' && \
 		echo 'ulimit -c unlimited' && \
-		echo 'export PATH="$(gb_INSTROOT)/program:$(gb_INSTROOT)/ure/bin:$$PATH"' && \
-		echo 'export GNOME_DISABLE_CRASH_DIALOG=1' && \
 		echo '# debugging assistance' && \
 		echo 'export SAL_DISABLE_FLOATGRAB=1' && \
 		echo 'export G_SLICE=always-malloc' && \

instsetoo_native/Package_setup.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(gb_INSTROOT)))
 $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\
 	$(call gb_Helper_get_rcfile,bootstrap) \
 	$(call gb_Helper_get_rcfile,fundamental) \
-	ooenv \
+	$(if $(ENABLE_OOENV),ooenv) \
 	$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \
 	$(call gb_Helper_get_rcfile,uno) \
 	$(call gb_Helper_get_rcfile,version) \

solenv/README

@@ -15,11 +15,6 @@ bin/
 		the scp2/ module to create an installer, and/or to
 		do a local install for the smoketest.
 
-	linkoo
-		creates a forest of symlinks inside an install such
-		that a developer can re-compile in the source tree,
-		and re-run without re-installing (on Unix at least)
-
 gbuild/
 	the (shiny new) gnumake build makefile fragments we are
 	migrating the codebase to use.

solenv/bin/ooinstall

@@ -20,7 +20,6 @@ use Cwd;
 
 $path = '';
 $strip = '';
-$do_link = 0;
 $is_windows = 0;
 my $tmp_dir;
 
@@ -45,9 +44,7 @@ if ($ENV{'SYSTEM_MOZILLA'} eq 'YES') {
 $ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload";
 
 for $arg (@ARGV) {
-    if ($arg eq '-l' || $arg eq '--link') {
-        $do_link = 1;
-    } elsif ($arg eq '-s' || $arg eq '--strip') {
+    if ($arg eq '-s' || $arg eq '--strip') {
         $strip = "-strip";
     } elsif ($arg eq '-h' || $arg eq '--help') {
         $help = 1;
@@ -61,8 +58,7 @@ for $arg (@ARGV) {
 $help = 1 if $path eq '';
 
 if ($help) {
-    print "ooinstall [-l] [-s] <prefix to install to>\n";
-    print "  -l/--link  - performs a linkoo on the installed source\n";
+    print "ooinstall [-s] <prefix to install to>\n";
     print "  -s/--strip - strip the installed binaries\n";
     exit 1;
 }
@@ -121,11 +117,6 @@ if ($ENV{BUILD_TYPE} =~ m/ODK/) {
 }
 print "Installer finished\n";
 
-if ($do_link && !$is_windows) {
-    system("$ENV{SOLARENV}/bin/linkoo $path $ENV{BUILDDIR}") &&
-      die "linkoo failed: $!";
-}
-
 # Local Variables:
 # cperl-indent-level: 4
 # indent-tabs-mode: nil