installer: search files in INSTDIR

INSTDIR has everything that will be installed anyway, so ideally the
file search patch should only be INSTDIR + whatever is needed to get the
Package file lists; especially WORKDIR seems inappropriate there.

The exception is extension .oxt files which apparently are not in
INSTDIR; not sure what to do about those.

Change-Id: I2477c25ab9fcf953fae9c219e76c467e14729cda

9 files changed, 43 insertions, 22 deletions

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 50ec864739da..8c995cbfee5a 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@ LibreOffice
         downloadname    LibreOffice_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOffice_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOffice_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath},{shlxthdlpath}
+        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{extensionsdir}
     }
 }
 
@@ -138,7 +138,7 @@ LibreOffice_Dev
         downloadname    LibreOfficeDev_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath},{shlxthdlpath}
+        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{extensionsdir}
     }
 }
 
@@ -177,7 +177,7 @@ LibreOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}
+        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir}
     }
 }
 
@@ -223,7 +223,7 @@ LibreOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}
+        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir}
     }
 }
 
@@ -262,7 +262,7 @@ LibreOffice_Test
         active 1
         compression 5
         script test
-        include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{filelistpath}
+        include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
     }
 }
 
@@ -308,6 +308,6 @@ LibreOffice_Dev_Test
         active 1
         compression 5
         script test
-        include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{filelistpath}
+        include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
     }
 }
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3b34334dab91..3b8740a8909d 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -95,7 +95,7 @@
     #define GID_DIR_URE_SHARE_MISC gid_Dir_Ure_Misc
 #endif
 
-#define RESFILENAME(name,lang)                STRING(CONCAT4(ResTarget/,name,lang,.res))
+#define RESFILENAME(name,lang)                STRING(CONCAT3(name,lang,.res))
 #define READMETXTFILENAME(name,lang,ext)      STRING(CONCAT4(name,lang,.,ext))
 #define READMEFILENAME(name,lang)             STRING(CONCAT2(name,lang))
 #define EXTRAFILENAME(name,lang)              STRING(CONCAT3(name,lang,.zip))
diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp
index 5cef25165f7a..172f7f30d470 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -39,7 +39,7 @@ End
 File gid_File_PostgresqlSdbc_Rdb
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program_Services;
-    Name = "Rdb/postgresql-sdbc.rdb";
+    Name = "postgresql-sdbc.rdb";
     Styles = (PACKED);
 End
 
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index aaca36a8fdd4..3161490d6222 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -30,7 +30,7 @@ File gid_File_Oxt_Presentation_Minimizer
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
-    Name = "Extension/presentation-minimizer.oxt";
+    Name = "presentation-minimizer.oxt";
 End
 
 #endif
@@ -43,7 +43,7 @@ File gid_File_Oxt_MediaWiki
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
-    Name = "Extension/wiki-publisher.oxt";
+    Name = "wiki-publisher.oxt";
 End
 
 #endif
@@ -173,7 +173,7 @@ File gid_File_Oxt_NLPSolver
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
-    Name = "Extension/nlpsolver.oxt";
+    Name = "nlpsolver.oxt";
 End
 
 #endif
@@ -199,7 +199,7 @@ File gid_File_Oxt_MySQLConnector
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
-    Name = "Extension/mysql-connector-ooo.oxt";
+    Name = "mysql-connector-ooo.oxt";
 End
 
 #endif
@@ -234,7 +234,7 @@ STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShel
 
 File gid_File_Rdb_Scriptproviderforbeanshell
     TXT_FILE_BODY;
-    Name = "Rdb/scriptproviderforbeanshell.rdb";
+    Name = "scriptproviderforbeanshell.rdb";
     Dir = gid_Brand_Dir_Program_Services;
     Styles = (PACKED);
 End
@@ -251,7 +251,7 @@ STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScr
 
 File gid_File_Rdb_Scriptproviderforjavascript
     TXT_FILE_BODY;
-    Name = "Rdb/scriptproviderforjavascript.rdb";
+    Name = "scriptproviderforjavascript.rdb";
     Dir = gid_Brand_Dir_Program_Services;
     Styles = (PACKED);
 End
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 65d1e7f74ab8..994a1fc3eaaf 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -646,35 +646,35 @@ File gid_File_Txt_Pagein_Calc
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
-    Name = "Pagein/pagein-calc";
+    Name = "pagein-calc";
 End
 
 File gid_File_Txt_Pagein_Common
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
-    Name = "Pagein/pagein-common";
+    Name = "pagein-common";
 End
 
 File gid_File_Txt_Pagein_Draw
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
-    Name = "Pagein/pagein-draw";
+    Name = "pagein-draw";
 End
 
 File gid_File_Txt_Pagein_Impress
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
-    Name = "Pagein/pagein-impress";
+    Name = "pagein-impress";
 End
 
 File gid_File_Txt_Pagein_Writer
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
-    Name = "Pagein/pagein-writer";
+    Name = "pagein-writer";
 End
 
 #endif
@@ -688,7 +688,7 @@ End
 
 File gid_Starregistry_Services_Rdb
     TXT_FILE_BODY;
-    Name = "Rdb/services.rdb";
+    Name = "services.rdb";
     Dir = gid_Brand_Dir_Program_Services;
     Styles = (PACKED);
 End
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 48807c9c13c1..a1f76461aa03 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -574,7 +574,7 @@ End
 File gid_File_Misc_ServicesRdb
     TXT_FILE_BODY;
     Dir = GID_DIR_URE_SHARE_MISC;
-    Name = "Rdb/ure/services.rdb";
+    Name = "ure/services.rdb";
     Styles = (PACKED);
 End
 
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 57f347d9b594..e4d5336df41d 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -52,7 +52,7 @@ STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader )
 File gid_File_Pyuno_Rdb
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program_Services;
-    Name = "Rdb/pyuno.rdb";
+    Name = "pyuno.rdb";
     Styles = (PACKED);
 End
 
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 7591fc0e9946..e76037ba2ba6 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -58,6 +58,12 @@ sub create_pathvariables
     my $platformname  = $environment->{'OUTPATH'};
     $variables{'platformname'} = $platformname;
 
+    my $instdir = $ENV{'INSTDIR'};
+    $variables{'instdir'} = $instdir;
+
+    my $extensionsdir = $environment->{'WORKDIR'} . $installer::globals::separator . "Extension";
+    $variables{'extensionsdir'} = $extensionsdir;
+
     my $filelistpath = $environment->{'WORKDIR'};
     $variables{'filelistpath'} = $filelistpath;
 
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index bc1ac37af167..626763847acf 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1068,8 +1068,23 @@ sub get_Source_Directory_For_Files_From_Includepathlist
 
         my $sourcepathref = "";
 
+        my $destination = $onefile->{'destination'};
+        my $instdirdestination;
+        if ($destination)
+        {
+            $instdirdestination = $ENV{'INSTDIR'} . $installer::globals::separator . $onefile->{'destination'};
+        }
+        if ($instdirdestination && -f $instdirdestination)
+        {
+            $infoline = "SUCCESS: INSTDIR Source for $onefilename: $instdirdestination\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            $$sourcepathref = $instdirdestination;
+        }
+        else
+        {
         if ( $file_can_miss ) { $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, $includepatharrayref, 0); }
         else { $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, $includepatharrayref, 1); }
+        }
 
         $onefile->{'sourcepath'} = $$sourcepathref; # This $$sourcepathref is empty, if no source was found
     }