summaryrefslogtreecommitdiff
path: root/scp2
AgeCommit message (Collapse)AuthorFilesLines
2014-09-28Fix 64914e407ccac9 - #endif/#else mixupChris Sherlock1-1/+2
Change-Id: Ia99ae45e66984ac0d88b6e9b6ca4514cd68f9634
2014-09-27vs2012 express support.Norbert Thiebaud5-2/+109
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-25scp2: remove some very SPECIAL unused macrosMichael Stahl1-11/+0
Change-Id: I28f2f4bc3c43aac1faf8be35cf7ce89480487102
2014-09-18Use instsetoo_native-generated uno ini-file for both instdir and instsetsStephan Bergmann1-81/+0
Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656
2014-09-17Fix incorrect pathname in commentTor Lillqvist1-1/+1
Change-Id: Icd5bbba4e20fb5fbd24fede1318a2dd21a673601
2014-09-17Correct the location of the URE unorc in scp2 for OS XTor Lillqvist2-1/+7
The URE unorc should be in Resources/ure/etc also when constructing an app bundle from scp2 data. Change-Id: Id33d20bda0175018b8340c686ae9cd47525cd401
2014-09-17BRAND_BIN_SUBDIR -> BRAND_INI_DIR, to cater for new Mac OS X layoutStephan Bergmann1-2/+2
Change-Id: Ic367545895a25a4cf6e95fc1be2f5db9f36a221b
2014-09-16Wrong URE_INTERNAL_LIB_DIR value for MACOSXStephan Bergmann1-1/+1
Change-Id: I3bb7310f42ee6ddf6217326589566cf4d4781e17
2014-09-16Wrong URE_INTERNAL_JAVA_DIR value for MACOSXStephan Bergmann1-1/+1
Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
2014-09-16Wrong UNO_TYPES value for MACOSXStephan Bergmann1-3/+1
Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
2014-09-16Rename LO-specific uno ini-file (Linux: program/unorc) to "louno"Stephan Bergmann2-38/+38
...to avoid confusion with the URE uno ini-file (Linux: ure/lib/unorc). It might even work to get rid of the louno ini-file altogether and fold its contents into the fundamental ini-file, but at least desktop/source/deployment/misc/dp_misc.cxx accesses the louno ini-file directly, so would need some inspection to avoid potential regressions. Change-Id: Ib49bbc4c814d677c22e68d2dd0f11af6d8423bb6
2014-09-11create a master document template typeCaolán McNamara1-0/+8
of application/vnd.oasis.opendocument.text-master-template with suffic otm https://lists.oasis-open.org/archives/office-comment/201002/msg00042.html desktop/icons/oasis-master-document-template.icns is just a copy of desktop/icons/oasis-master-document.icns because I can't draw Change-Id: I0d18c79c4c893e97505052884ee8be97d0f117a1 Reviewed-on: https://gerrit.libreoffice.org/11350 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-09-09fdo#45071: Remove ENABLE_NPAPI_INTO_BROWSER left-oversStephan Bergmann2-2/+0
...from previous commit Change-Id: I945faa6215f971ce817c6450fe0786da0696091f
2014-09-09fdo#45071 Remove Libreoffice browser pluginBryan Quigley3-23/+0
This removes ENABLE_NPAPI_INTO_BROWSER while it should keep ENABLE_NPAPI_FROM_BROWSER (embed flash in LO) intact. Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Conflicts: extensions/source/nsplugin/source/npshell.cxx Change-Id: I80a9159a75653c74423d8fdc7c188568d3188e04
2014-09-09Make the "Mac-like" or "canonical" app bundle structure always used on OS XTor Lillqvist18-108/+35
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-08-18these strings should be translatableCaolán McNamara2-0/+7
so bring back scn.res and add them in there Change-Id: I378d64f524c64295d26223f54fe17950b475cd80
2014-08-17remove executable bitsThomas Arnhold1-0/+0
Change-Id: Iec785ae538de81325812b1e6fe33115789b39770
2014-08-15Another blind fix attempt for WNTTor Lillqvist1-0/+8
Change-Id: I369f3db3d72c93531e753b16fbd97abce4e1c0ed
2014-08-15Blind fix attempt for WNTTor Lillqvist1-0/+10
Change-Id: Iee1c5a5a1c9db5114b2b31cfac66d1a2d673a585
2014-08-15TypoTor Lillqvist1-1/+1
Change-Id: I9ba1a5679eb636103ccf7b34f120ed0d03903e76
2014-08-15When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE put only binaries in the MacOS dirTor Lillqvist2-0/+5
The new code signing is more strict and enforces bundle structure harder, it seems. When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE bypass the unoinfo and python shell scripts. If they actually are needed, will have to put them somewhere under Resources. Change-Id: I14a34936b78195746d2b88d25603952ce5309380
2014-08-15Fixes for the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE caseTor Lillqvist3-12/+18
Change-Id: Ic3d27298264df9aa4e3e976fbca477106dbe180a
2014-08-10fdo#78845 Packaging of fpicker ui filesMaxim Monastirsky3-0/+4
Change-Id: I5edb560dc511f6f0e47984303ce41488806e9e20
2014-08-10Use LIBO_URE_BIN_FOLDER and LIBO_SHARE_JAVA_FOLDERTor Lillqvist1-2/+2
Needed in case of --enable-canonical-installation-tree-structure. Change-Id: I965ebd9b89e1b9f7bb6534e3c25d29d3b470acf4
2014-08-02scp2: remove unused STD_LIB_FILE etc. macrosMichael Stahl1-18/+0
Change-Id: Ib6cf165019d72ba64b5111186ea3fdba076c69ba
2014-08-02scp2: move winexplorerext libs to AutoInstallMichael Stahl5-66/+37
Change-Id: I93d08ab46e401a2f37c9ad6e425e8014c7e05db1
2014-08-02setup_native, scp2: remove "regpatchactivex" MSI custom-action and libMichael Stahl2-11/+1
This was effectively omitted from the installation set since commit 26c142ca5f2b405b02ab5701dfaeab7bf281a727, and is apparently related to the obsolete StarOffice patch mechanism. Change-Id: I9a4c113e19e5b2b751e3da64b4dde53320132a35
2014-08-02scp2: move activex libs to AutoInstallMichael Stahl4-45/+12
Change-Id: I08fac26859d97e3d7a60d3ba443c2d2ca039789b
2014-07-20scp2: move xsec_xmlsec lib to AutoInstallMichael Stahl2-15/+0
Change-Id: Iff2bb51047d6b8698b65b83ff79a99f6f125b53c
2014-07-20scp2: move python libraries to AutoInstallMichael Stahl3-36/+2
Change-Id: Ib89daf3e608fd995845062eae2a7a33149964844
2014-07-20scp2: move postgresqlsdbc libraries to AutoInstallMichael Stahl3-7/+8
Change-Id: Ia96e85191d877ebfd7621f7aa572f29e6482716c
2014-07-20scp2: move OGLTrans library to AutoInstallMichael Stahl3-5/+8
Change-Id: I5140f4053fbb1add4bc0b1b8cb6cd9772f3ffa28
2014-07-20scp2: damnit, did i really push this utter garbage?Michael Stahl1-1/+1
Change-Id: I262456efc52c74aeeda1c55b24a69c4c628a26d8
2014-07-18scp2: stupid typosMichael Stahl2-2/+2
Change-Id: I94b3f39ce3dc642c97dfd515b026e4470724b06c
2014-07-18fix buildDavid Tardon1-2/+2
Change-Id: Ic370d7a2443543b83677280394bfd796365392c6
2014-07-18scp2: move pdfimport library to AutoInstallMichael Stahl3-5/+6
Change-Id: Iac7d30ea181edbc479034e7b6f8eea285d7f6fbb
2014-07-17fdo#81111 Package formula ui filesMaxim Monastirsky3-0/+4
Change-Id: Ie73f3ea4eff4dc8400d2ba3736c162d728c277d3 Reviewed-on: https://gerrit.libreoffice.org/10365 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-04add Carlito/Caladea fonts to install scriptAndras Timar2-3/+9
They were added in libreoffice-4-1 branch but not anywhere else. See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534
2014-07-03typo: dreport -> dbreportAndras Timar1-1/+1
Change-Id: I7d6208a4ac170adb815ec02364076c5b49cfab9a
2014-07-03fdo#80535 add missing .ui localizations to install scriptAndras Timar1-0/+4
Change-Id: I248838633e99ac0ce51950db9049dd451394b558
2014-07-03fdo#80535 add missing .ui localizations to install scriptAndras Timar1-0/+4
Change-Id: Ie7e60522df6aff8fc68b36daddd1c84d0a97cd59
2014-07-03fdo#77057 quick fix: do not touch KindMap for alien file typesAndras Timar1-4/+0
Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1
2014-06-22fdo#80332 remove "Support assistive technology tools" checkbox from installerAndras Timar1-38/+0
Revert "fdo#39833 add "Support assistive technology tools" option to Windows installer" This reverts commit 98fd8f345504e98e9ed16f4845d55f5b88b77a5e. Conflicts: instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt Change-Id: I04cafd063bd06db37eadd13b58f7b7adfad2ca42
2014-06-13scp2: move reportbuilder libraries to AutoInstallMichael Stahl3-8/+1
Change-Id: I3369b4c5c412741e82279db95cb517a8ae69b25c
2014-06-13scp2: move basebmp, avmediaQuickTime, avmediaMacAVF libs to AutoInstallMichael Stahl2-30/+0
Change-Id: I1b7a8fd5272cb56b2a45c89de79165cfd71711c4
2014-06-12scn resource file is empty now post ui-ificationCaolán McNamara2-7/+0
Change-Id: Id8a6d6c4faf3101b13d84de180f8db7cab2cb16f
2014-06-11do no try to install bsh/js when not building themBjoern Michaelsen1-2/+4
Change-Id: Ic1521ad9a67c9930e2e4561eacb1e78905310613
2014-06-11Convert RID_SANE_DIALOG to .uiPalenik Mihály1-0/+1
Change-Id: I1f08493cdc18f4c0691a8436368432fe4e94dec3 Reviewed-on: https://gerrit.libreoffice.org/9696 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-09move UOF and Office 2003 filters to xsltfilter moduleDavid Tardon4-8/+8
Change-Id: I6e5ac310567bb7bd12fbba444e4e1deb9fea30d5
2014-06-09scp2: kde module wants to install executables nowMichael Stahl1-1/+1
Change-Id: I573a48a96061e0d8b30c8e15fb9235df68c4f4e5
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 01:12:02 +0000