Commit Graph

120 Commits

Author SHA1 Message Date
Michael Stahl
70cba374f6 scp2: add AutoInstall support for executables with COMPONENTCONDITION
Change-Id: I36f14d9ba08ab2473a555681b934b8b35cfa06b2
2015-06-22 21:02:05 +02:00
Stephan Bergmann
827430c8c0 Fold URE: Windows
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.

Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
2014-12-03 15:19:55 +01:00
Stephan Bergmann
982f199a98 Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink

Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-12-01 15:10:32 +01:00
Stephan Bergmann
8fdb239735 Fold URE: Linux ure/share/java/* -> program/classes/
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
2014-11-28 15:32:26 +01:00
Stephan Bergmann
45ca1bfc22 Fold URE: Linux ure/lib/* -> program/
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge
(and juh.jar had lacked adaption for Mac OS X).

Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
2014-11-28 11:57:28 +01:00
Stephan Bergmann
eef94c1655 Fold URE: Linux ure/bin/* -> program/
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
2014-11-28 11:57:28 +01:00
Michael Stahl
25bfdffdac scp2: remove EXENAME
Change-Id: I045a65d4efbaf8fcb55318ffce4f8929e2fbbe15
2014-10-29 11:37:51 +01:00
Chris Sherlock
cadc2cbed1 Fix 64914e407c - #endif/#else mixup
Change-Id: Ia99ae45e66984ac0d88b6e9b6ca4514cd68f9634
2014-09-28 20:51:27 +10:00
Norbert Thiebaud
64914e407c vs2012 express support.
vs2012 express does not have atl so one need to
--disable-atl and --disable-activex

but then the packaging still try to include a few _x64.dll
that are not built.

Change-Id: I88ca5b9d23febd5a714fb48321dde5424cafceb6
2014-09-27 14:05:28 -05:00
Michael Stahl
cce464488d scp2: remove some very SPECIAL unused macros
Change-Id: I28f2f4bc3c43aac1faf8be35cf7ce89480487102
2014-09-25 20:56:06 +02:00
Tor Lillqvist
6492c8576e Make the "Mac-like" or "canonical" app bundle structure always used on OS X
In other words, only executable files go in the MacOS folder. Dynamic
libraries and bundled frameworks (i.e., LibreOfficePython), and
nothing else, go in the Frameworks folder, and all other files go in
the Resources folder.

Especially, note that Java class files and rc (.ini) files also go in
Resources.

Such an app bundle structure is what Apple strongly suggests one
should use, and it has been hinted that future versions of code
signing and/or Gatekeeper will require such a structure.

There is still some ugliness thanks to traces of the historical
separation of URE from "the office". Like there are two separate
"unorc" files, one for URE, one for the LibreOffice application. IMHO,
this should be cleaned up, but is probably controversial.

(Eek! I now see there are actually *three* unorc files in the app
bundle. Not intentional. Need to fix that later.)

Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
2014-09-09 13:55:23 +03:00
Thomas Arnhold
e99535df4d remove executable bits
Change-Id: Iec785ae538de81325812b1e6fe33115789b39770
2014-08-17 05:50:13 +02:00
Tor Lillqvist
88be7b54c5 Fixes for the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case
Change-Id: Ic3d27298264df9aa4e3e976fbca477106dbe180a
2014-08-15 08:56:58 +03:00
Michael Stahl
ee24b3b7d8 scp2: remove unused STD_LIB_FILE etc. macros
Change-Id: Ib6cf165019d72ba64b5111186ea3fdba076c69ba
2014-08-02 22:23:51 +02:00
Michael Stahl
b2193386dd scp2: move winexplorerext libs to AutoInstall
Change-Id: I93d08ab46e401a2f37c9ad6e425e8014c7e05db1
2014-08-02 22:23:50 +02:00
Andras Timar
57bf88d21c fdo#77057 quick fix: do not touch KindMap for alien file types
Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1
2014-07-03 13:35:55 +02:00
Michael Stahl
a3d89c3faf scp: remove unused STD_JAR_FILE, JARFILENAME
Change-Id: I7e78e45b66ea2b74268f4e4479ebb0259eba130c
2014-05-27 23:40:37 +02:00
Michael Stahl
8475eb98be scp2: move bsh to AutoInstall
Change-Id: Ib030d8fc3bd7c3c38f8728c80414fde505b36537
2014-03-18 22:18:10 +01:00
Alexander Wilms
2434ea5930 Remove visual noise from scp2
Change-Id: Id333de870389e8b4a074aa07fb2d0af336c5062a
Reviewed-on: https://gerrit.libreoffice.org/8304
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-26 08:39:14 -06:00
Michael Stahl
7eeac88bdb fdo#75526: argh missing semicolon
Change-Id: I4cabdcd3d4d5e4a446a4784d7a657655a4fbdfdc
2014-02-26 14:57:35 +01:00
Michael Stahl
482ab0d096 fdo#75526: sdk: install URE library symlinks / import libs again
This is a bit involved because since the LinkTarget now creates the
instdir/sdk/lib/* files itself a Package cannot be used; so convert the
URE libraries to AutoInstall and add special handling for them to
gb_Helper_register_libraries_for_install to create the necessary links
in the "sdk" install-module.

(regression from 70c35265f5)

Change-Id: Ia5467f3303d59f7f5f4a88adc22ceffb82a21ff1
2014-02-26 14:27:49 +01:00
Michael Stahl
73f4ef48d0 scp2: stop cargo-culting DONT_OVERWRITE around
There appears to be no usage of this Style in the installer Perl code in
the git history.

Change-Id: I137627505af5c7b33006437e83624b34ca2e3583
2014-02-05 20:30:07 +01:00
Michael Stahl
ba26251f4d gbuild: add gb_Helper_register_packages_for_install
Change-Id: I855a7e260a9ad05d655d121dbed97597b21187d2
2014-02-04 21:16:16 +01:00
Michael Stahl
9870a5f73d scp2: move URE jars to AutoInstall
Change-Id: I68c5f5ac015e8c5d8efd60921f38eb31c6f8088d
2014-02-04 21:16:16 +01:00
Michael Stahl
79ab9d7b6e fdo#74495: gbuild: AutoInstall: add support for ComponentCondition
... via new scp2 macro LIBO_LIB_FILE_COMPONENTCONDITION.

(regression from 2feb756dd5)

Change-Id: I6ab30cc1c14c34bd7dc1325e3f98d972544e7eea
2014-02-04 16:50:18 +01:00
Matúš Kukan
c2f5e09900 Zip .ui translations per UIConfig target.
Fix installer / scp2 to not ignore directory prefix in 'Name'.

Change-Id: Ib319363c8be73a72029f1ba3833e518e15c55e29
Reviewed-on: https://gerrit.libreoffice.org/6915
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-12-06 05:43:21 -06:00
Michael Stahl
5e300e9030 odk: remove Package_bin, instead auto-install executables
This is somewhat annoying since it requires re-introducing stupid
directories in scp2, but if the executables should be put in INSTDIR
directly then the Package_bin needs to go.

Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740
2013-09-22 11:08:31 +02:00
Michael Stahl
f89cce877c 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
2013-09-12 00:20:39 +02:00
Stephan Bergmann
e5f580d2db FILELIST_DIR: gb_INSTROOT already cont. LibreOffice.app/Contents on OS X
Change-Id: I2753079ff532642c8fb1b43f02211197cdb2702a
2013-09-11 17:28:26 +02:00
Matúš Kukan
529b1ea6f4 gbuild: install .res files directly from workdir
Change-Id: I95e4f150c21f991f629530eebf19748c2768f856
2013-09-10 22:58:05 +02:00
Andras Timar
a41d72333d kill VERSION_INDEPENDENT_COMP_ID
Version independent ComponentID in Component table of MSI means
that the GUID is calculated from the Component name only, the
PRODUCTVERSION is not concatenated to the name. Providing that
name is constant in all versions, the resulting GUID would be
the same e.g. for 4.0, 4.1, 4.2 etc. But what is it good for?
Faster upgrades maybe? But name can also change, we did not
pay attention to keep it constant. So in order to help scp2
cleanup, VERSION_INDEPENDENT_COMP_ID flag was obsoleted and
removed.

Change-Id: I8e1ee450524b02f07d0b0553f6b82d0321dbddcf
2013-09-10 09:10:32 +02:00
Michael Stahl
b09c5286b8 scp2: convert BINARYTABLE MSI CustomAction dlls to AutoInstall
Second attempt, this time using a new type LIBO_LIB_FILE_BINARYTABLE
in scp2/macros.inc; for the resulting MSI file Orca lists the same
files in "Binary" table now.

Change-Id: I550ede75f16a46da9dd7377594aa28b7c06f0348
2013-08-31 23:46:24 +02:00
Jesús Corrius
1982c3fd67 now really create the key in the right place
sigh...

Change-Id: I6d55da7b6e7fc1c6a9573aa05f9045388edf3684
Reviewed-on: https://gerrit.libreoffice.org/5589
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-23 06:20:18 +00:00
Jesús Corrius
cbb3f73ade I am stupid
It's not actually that I am massively stupid, it's just
that I've got bad luck when it comes to thinking.

This patch makes the installer create the values in the
right location. Where now...? you'd better don't ask.

/me goes for a brown paper bag.

Change-Id: I792ba5e9a78a895d3df7dfc48d1fc7c5303ce28e
Reviewed-on: https://gerrit.libreoffice.org/5587
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-22 20:41:32 +00:00
Jesús Corrius
c4d5b14834 Registy item fix for AppUserModelID and use STRING macro for strings
Change-Id: Id6434355aabdde4f39232ab5a839201a85ca4d29
Reviewed-on: https://gerrit.libreoffice.org/5529
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-20 09:28:00 +00:00
Tor Lillqvist
058a3d1c46 Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.

Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
2013-08-18 21:11:16 +03:00
Tor Lillqvist
c6a7300974 Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.

Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
2013-08-18 21:11:16 +03:00
Jesús Corrius
9b6e7e72eb AppUserModelIDs registry entries are useful only on Windows7+
Change-Id: Ia17608d603434fa244c056bf711ce4951644246e
Reviewed-on: https://gerrit.libreoffice.org/5385
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-13 14:53:01 +00:00
Jesús Corrius
5f23dac65b Add AppUserModelID for all supported formats
Now only the ODF formats have AppUserModelID, but we
need AppUserModelID for all supported formats so the
Windows 7 recent documents works as expected.

This patch only adds a few registry keys during the
installation process on Windows.

Change-Id: I2d7460c1ed8b4ba77da8bb1c5b0c696c521353c5
Reviewed-on: https://gerrit.libreoffice.org/5274
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-08 19:49:26 +00:00
Matúš Kukan
9555b5bdb9 Add gengal to RepositoryFixes and autoinstall it.
Change-Id: I935fb9fd2620447f9aba9142b7db896e6fe31133
2013-06-15 21:32:37 +02:00
Matúš Kukan
74f5df9bac gbuild: rework AutoInstallLibs and autoinstall ure executables
Change-Id: I7312d94f90758d450a69410819c5e8c142756a47
2013-06-10 20:03:01 +02:00
Michael Meeks
1e4422a4b4 re-base on ALv2 code. Includes:
Patches contributed by Mathias Bauer
        gnumake4 work variously
        http://svn.apache.org/viewvc?view=revision&revision=1394707
        http://svn.apache.org/viewvc?view=revision&revision=1394326
        http://svn.apache.org/viewvc?view=revision&revision=1397337
        http://svn.apache.org/viewvc?view=revision&revision=1397315
        http://svn.apache.org/viewvc?view=revision&revision=1396797

	Patches contributed by Andre Fischer
	Fixed getcsym.awk to handle #-comments that contain special regexp chars.
        http://svn.apache.org/viewvc?view=revision&revision=1230971
	118778: Added ADDITIONAL_REPOSITORIES environment variable and its
	automatic setup in configure.
        http://svn.apache.org/viewvc?view=revision&revision=1232004
	118160: Added external CoinMP library.
        http://svn.apache.org/viewvc?view=revision&revision=1233909

	Patches contributed by Herbert Duerr
	#i119168# use generic LICENSE file for langpacks and sdks
        http://svn.apache.org/viewvc?view=revision&revision=1310178
	macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars
        http://svn.apache.org/viewvc?view=revision&revision=1183367
	allow gbuild with empty sysroot on linux
        http://svn.apache.org/viewvc?view=revision&revision=1179186

	Patches contributed by Ingo Schmidt
	native373: #164472# improvements for msi database
        http://svn.apache.org/viewvc?view=revision&revision=1167540
        http://svn.apache.org/viewvc?view=revision&revision=1167539

	Patches contributed by Jurgen Schmidt
	adapt setup package scripts to handle special DS_Store file for
	developer snapshot builds
        http://svn.apache.org/viewvc?view=revision&revision=1232430
	imported patch extensions_i117681.patch
	http://svn.apache.org/viewvc?view=revision&revision=1172102

	Patches contributed by Michael Stahl
	gbuild: RepositoryFixes.mk should be optional
        http://svn.apache.org/viewvc?view=revision&revision=1166123
	xslt filter: remove the FLA horror
	wordml import filter: replace FLA usage with plain XSLT
	http://svn.apache.org/viewvc?view=revision&revision=1363727

	Patch contributed by Oliver-Rainer Wittmann
	i#88652: applied patch, remove unicows deps
	http://svn.apache.org/viewvc?view=revision&revision=1177585

    Remove lots of OS2 conditionals, re-extract Rhino Java, unwind
    cppunit pieces, cleanup Mac image bits, remove coin-mp and
    re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand
    MPLv2 subset checking.

Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
2013-06-03 11:41:36 +01:00
Michael Meeks
b54709dd2c remove pre-compiled textshapes and transportation galleries.
Further gnumake fixups, package the files in the Gallery rules.

Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8
2013-05-15 09:37:42 +01:00
Michael Meeks
5d5950a766 gallery: convert text-shapes to new build logic.
Change-Id: Ia45a2eed7104b376b92290e1a40219e8988d927b
2013-05-15 09:37:41 +01:00
David Tardon
2dcf42b417 install data files from extras using filelists
Change-Id: Ib092623501e36fa759a5215a435d21e1fea8dfdd
2013-05-04 16:44:47 +02:00
David Tardon
d23f8bb0ca gbuild: deliver help files as packages
Change-Id: I52904567d0c7434af3f013cad7c3d9a8a67ac9f2
Reviewed-on: https://gerrit.libreoffice.org/3384
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-15 05:26:21 +00:00
Thomas Arnhold
6fb3c3872c remove unused macros
Change-Id: I0b0a73e8c9d6c5fb760c2278e58b87f08e881ce4
2013-04-13 15:01:34 +02:00
David Tardon
5ec03f9fe5 drop unused macros
Change-Id: I8965462b47e02863e40f2c218e8ceb9cd995afea
2013-04-14 13:52:26 +02:00
David Tardon
ae1fea19fd install fonts using filelists
Change-Id: I1312908e2039a9836d25ec3a558f9ef78abf177e
2013-04-14 13:52:26 +02:00
David Tardon
45cf2634f7 FontName is not used for anything
... and it has not been used since 2004, when it was added. In other
words, it has never been used at all.

Change-Id: I3476b5497e901b3cffe5f589948ee7e8e3b63fe6
2013-04-14 13:52:25 +02:00