Commit graph

74 commits

Author SHA1 Message Date
Bjoern Michaelsen
e94a19f3e0 simplfy dmake to gbuild bridgefile 2011-10-05 00:31:50 +02:00
Norbert Thiebaud
d64bbd6bf8 detect gmake 3.81 and limit to -j1 unless num-cpu is explicitly set 2011-08-19 18:29:07 -05:00
Bjoern Michaelsen
09727e4dbf resyncing to master 2011-07-21 18:34:26 +02:00
Bjoern Michaelsen
e268256133 Merge branch 'master' into feature/gnumake4
Conflicts:
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	setup_native/prj/build.lst
	setup_native/prj/d.lst
	wizards/Jar_query.mk
	wizards/Module_wizards.mk
	wizards/Zip_launcher.mk
	wizards/com/sun/star/wizards/report/makefile.mk
	wizards/prj/build.lst
	wizards/prj/d.lst
	wizards/util/target.pmk
2011-06-19 12:54:22 +02:00
Tor Lillqvist
ac735597e5 Use DESKTOP and NATIVE where appropriate 2011-06-16 20:58:12 +03:00
Mathias Bauer
2839168cd0 CWS gnumake4: convert wizards to new build system 2011-06-16 10:11:45 +02:00
Tor Lillqvist
d32db65e8f Drop %_EXT% which was always empty 2011-06-03 13:25:56 +03:00
Petr Mladek
adad15cff9 set build depencencies against the new "translations" module 2011-03-25 12:14:34 +01:00
Ivo Hinkelmann
8427b0f498 masterfix DEV300: #i10000# usage of L10N build_type 2011-02-22 19:07:34 +01:00
sb
9c5ef3ce00 sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt 2010-10-22 10:37:46 +02:00
sb
5dbc43ead1 sb129: #i113189# change UNO components to use passive registration 2010-09-10 13:10:07 +02:00
sb
70a334670b sb120: #i109978# removed --disable-qadevooo 2010-03-09 17:31:37 +01:00
Ivo Hinkelmann
6647ad75a6 CWS-TOOLING: integrate CWS l10ncleanup04
2009-05-28 13:46:54 +0200 ihi  r272407 : remove forgotten sdf's
2009-05-25 22:32:35 +0200 ihi  r272273 : no WITH_LANG fix
2009-05-25 20:45:58 +0200 ihi  r272272 : remove some comments
2009-05-25 19:55:21 +0200 ihi  r272271 : svx dialog -> cui l10n move
2009-05-25 18:30:58 +0200 ihi  r272268 : build fix
2009-05-18 16:32:02 +0200 ihi  r272033 : bash fix
2009-05-18 16:31:32 +0200 ihi  r272032 : bash fix
2009-05-14 16:23:39 +0200 ihi  r271901 : #i79750# Translation moved to l10n module
2009-05-11 23:36:05 +0200 ihi  r271793 : #i79750# Translation moved into own module
2009-06-17 13:15:46 +00:00
Vladimir Glazounov
93d89bfbc1 CWS-TOOLING: integrate CWS sb93 2008-10-01 09:04:58 +00:00
Vladimir Glazounov
4621794d63 INTEGRATION: CWS xsltfilter10 (1.42.12); FILE MERGED
2008/07/18 13:34:21 sus 1.42.12.1: #i91376# Removed Xalan dependency
2008-08-19 11:06:30 +00:00
Rüdiger Timm
aeb7350de4 INTEGRATION: CWS ab56 (1.43.4); FILE MERGED
2008/07/29 10:07:25 ab 1.43.4.1: #i92231# Move share library entries to share/basic xlc files
2008-07-31 18:10:48 +00:00
Oliver Bolte
24f2631a7b INTEGRATION: CWS dellauncher (1.42.16); FILE MERGED
2008/07/16 15:09:12 sg 1.42.16.1: #91575#removed source/launcher from build list: launcher library is not packed into OpenOffice.org anymore, obsolete by now
2008-07-22 11:31:57 +00:00
Kurt Zenker
a301865f3b INTEGRATION: CWS rptwizard01 (1.41.72); FILE MERGED
2008/03/07 07:54:03 lla 1.41.72.2: #i86092# build dependencies
2008/02/29 08:37:56 lla 1.41.72.1: #i86092# add com.sun.star.wizards.report.layout
2008-06-25 13:43:59 +00:00
Rüdiger Timm
2033b1e198 #i10000# com/sun/star/wizards/query/QueryWizard.java needs FormWizard. 2006-10-26 11:00:18 +00:00
Jens-Heiner Rechtien
ba536905d9 INTEGRATION: CWS pj59 (1.15.46); FILE MERGED
2006/09/19 07:51:06 pjanik 1.15.46.1: #i69025#: Remove extraneous macosx-create-bundle call.
2006-10-24 12:40:14 +00:00
Jens-Heiner Rechtien
9af3a65b9a INTEGRATION: CWS pj53 (1.14.126); FILE MERGED
2006/04/13 15:14:14 pjanik 1.14.126.1: #i61798#: Rename create-bundle to macosx-create-bundle.
2006-04-20 13:22:43 +00:00
Jens-Heiner Rechtien
5ab9063f0e INTEGRATION: CWS cmcfixes19 (1.39.14); FILE MERGED
2005/09/23 08:14:20 cmc 1.39.14.1: #i54996# add xalan BUILD_TYPE
2005-09-28 14:39:20 +00:00
Rüdiger Timm
6ad109bd60 INTEGRATION: CWS cmcfixes14 (1.38.22); FILE MERGED
2005/08/10 11:29:43 cmc 1.38.22.1: #i53151# make QADEVOOO build item optional
2005-08-16 08:28:05 +00:00
Oliver Bolte
fcd4aacce8 #i10000#,#i47653# formwizard still needed 2005-07-08 11:34:30 +00:00
Oliver Bolte
229fb6dc69 INTEGRATION: CWS qwizardsbfooo20 (1.36.10); FILE MERGED
2005/06/10 14:36:40 bc 1.36.10.1: #i47653#Formwizard removed
2005-07-05 09:19:43 +00:00
Oliver Bolte
8eccbddd10 INTEGRATION: CWS ause027 (1.35.14); FILE MERGED
2005/04/25 15:55:24 hjs 1.35.14.1: #i37172# remove dependencies introduced to workaround this issue
2005-05-06 08:39:59 +00:00
Kurt Zenker
23f014c9b3 INTEGRATION: CWS dbwizard4 (1.13.96); FILE MERGED
2005/03/15 16:14:50 bc 1.13.96.4: ## resource file of imagelist added
2005/03/12 20:13:32 bc 1.13.96.3: ##resource file for images added
2005/02/17 13:50:32 bc 1.13.96.2: ##ControlArrangement in FormWizard modified
2005/02/09 15:36:36 bc 1.13.96.1: ##imagelists added
2005-03-18 15:30:00 +00:00
Kurt Zenker
04d0d1eb43 INTEGRATION: CWS dbwizard4 (1.33.2); FILE MERGED
2005/03/14 11:12:05 bc 1.33.2.4: ## imagelist added
2005/03/12 20:13:31 bc 1.33.2.3: ##resource file for images added
2005/03/12 18:33:57 bc 1.33.2.2: RESYNC: (1.33-1.34); FILE MERGED
2005/02/09 15:36:36 bc 1.33.2.1: ##imagelists added
2005-03-18 15:29:46 +00:00
Vladimir Glazounov
5edfb3a248 INTEGRATION: CWS macosx02 (1.32.18); FILE MERGED
2005/02/13 09:29:03 pjanik 1.32.18.1: #i42625#: Add transex3 module dependency.
2005-02-24 13:22:50 +00:00
Rüdiger Timm
579c2b1cba INTEGRATION: CWS extras16 (1.32.12); FILE MERGED
2005/01/26 14:53:24 bc 1.32.12.2: #37179#tutorial creator removed
2005/01/25 16:21:04 bc 1.32.12.1: #i37179#makefiles and buildlist now include xalan dependency
2005-01-28 14:56:56 +00:00
Kurt Zenker
cc37776ffc INTEGRATION: CWS dbwizard2 (1.28.8); FILE MERGED
2004/11/11 12:32:33 bc 1.28.8.1: ##duplicate labe for FormWizard removed
2004-11-26 20:48:02 +00:00
Rüdiger Timm
ed84d72ae4 INTEGRATION: CWS ause013 (1.30.2); FILE MERGED
2004/11/15 13:18:20 hjs 1.30.2.1: #i37074# avoid clashes in jar file creation
2004-11-15 12:44:35 +00:00
Jens-Heiner Rechtien
4eaa606edd INTEGRATION: CWS hr9 (1.28.4); FILE MERGED
2004/11/04 18:09:13 hjs 1.28.4.1: #i31658# fix jar creation
2004-11-09 11:14:19 +00:00
Pascal Junck
f8f0b48d12 INTEGRATION: CWS pj10 (1.28.2); FILE MERGED
2004/11/03 08:59:09 pjanik 1.28.2.1: #i36549#: Fix duplicate target name wz_formwiz.
2004-11-03 11:34:50 +00:00
Pascal Junck
54c3a7c307 INTEGRATION: CWS dbwizard1 (1.25.30); FILE MERGED
2004/10/27 09:50:38 tv 1.25.30.4: build commonwizards in one makefile
2004/10/11 16:46:11 tv 1.25.30.3: RESYNC: (1.25-1.26); FILE MERGED
2004/09/20 15:49:54 fs 1.25.30.2: wz_formwiz was a duplicate module shortcut
2004/08/19 16:55:30 bc 1.25.30.1: #i20423# buildlist expanded for Formwizard and TableWizard
2004-10-27 13:42:30 +00:00
Tom Verbeek
760873ed8c #i33782# commonwizards need to be built at once 2004-10-22 13:10:57 +00:00
Oliver Bolte
15f153fd0c INTEGRATION: CWS qwizards2 (1.23.2); FILE MERGED
2004/06/25 13:48:22 tv 1.23.2.3: correct dependencies
2004/06/25 13:40:27 rpiterman 1.23.2.2: merged fax wizard conflict
2004/06/24 09:46:37 tv 1.23.2.1: #116017# added fax wizard
2004-09-08 13:33:12 +00:00
Tom Verbeek
1f82c77eeb hotfix: build jar files that use MANIFEST sequentially 2004-06-03 12:22:47 +00:00
Rüdiger Timm
8ddac23c39 #i29656#, #i10000# Needs OOoRunner.jar out of module qadevOOo 2004-06-02 14:51:22 +00:00
Kurt Zenker
85e83eab22 INTEGRATION: CWS qwizards1 (1.19.94); FILE MERGED
2004/04/30 17:26:13 rpiterman 1.19.94.20: fixed target names to be unique.
2004/03/18 10:36:36 tv 1.19.94.19: web wizard is dependent on text document
2004/03/16 11:13:39 tv 1.19.94.18: corrected build order
2004/03/11 10:47:13 rpiterman 1.19.94.17: solved conflicts
2004/03/03 17:28:32 tv 1.19.94.16: correct dependencies for letter wizard
2004/02/06 10:09:06 tv 1.19.94.15: fixed typos
2004/01/28 17:56:50 tv 1.19.94.14: added report and query
2004/01/23 10:44:14 bc 1.19.94.13: #111603# Reportwizard and queryWizard added
2004/01/23 09:14:27 tv 1.19.94.12: added db package
2003/12/18 14:26:22 tv 1.19.94.11: added basic part of tutorials
2003/12/18 14:20:37 tv 1.19.94.10: removed db because it does not compile
2003/12/16 16:47:58 tv 1.19.94.9: added db
2003/12/16 16:00:55 tv 1.19.94.8: added Tutorial and removed high level wizards cause they don't compile at the moment
2003/12/15 11:16:46 tv 1.19.94.7: added Tutorial Creator and Executor
2003/12/02 07:49:06 bc 1.19.94.6: #111603# some modules removed
2003/11/26 16:07:08 tv 1.19.94.5: added letter wizard
2003/11/25 09:50:11 tv 1.19.94.4: dded build dependency wizards after filter
2003/11/25 09:41:26 tv 1.19.94.3: corrected dependecies between java dirs
2003/11/24 15:48:45 tv 1.19.94.2: RESYNC: (1.19-1.20); FILE MERGED
2003/11/18 14:04:54 tv 1.19.94.1: added missing makefile locations
2004-05-19 15:35:11 +00:00
Jens-Heiner Rechtien
005405df56 INTEGRATION: CWS ooo20031216 (1.20.14); FILE MERGED
2004/01/01 13:26:29 pjanik 1.20.14.1: #i10000#: Add dependency on unoil.
2004-02-04 10:48:16 +00:00
Jens-Heiner Rechtien
77c86b8b24 INTEGRATION: CWS geordi2q14 (1.12.22); FILE MERGED
2004/01/30 16:07:05 hr 1.12.22.1: #111934#: merge CWS ooo111fix2
2004-02-02 18:16:11 +00:00
Jens-Heiner Rechtien
4b76bf8c89 INTEGRATION: CWS geordi2q14 (1.20.20); FILE MERGED
2004/01/30 16:07:04 hr 1.20.20.1: #111934#: merge CWS ooo111fix2
2004-02-02 18:15:44 +00:00
Kurt Zenker
bda6455a72 INTEGRATION: CWS ause04 (1.11.86); FILE MERGED
2003/08/12 10:40:56 gh 1.11.86.1: remove old hid.lst particles and add new ones
2003-08-25 14:36:27 +00:00
Hans-Joachim Lankenau
e2a405d7d2 #100000# added module dependency 2003-08-20 10:03:49 +00:00
Rüdiger Timm
e24430ad6a #100000# now report depends on common 2002-12-09 13:34:04 +00:00
Rüdiger Timm
6f2cb58fa8 #100000# com/sun/star/wizards/common depends on com/sun/star/wizards/report 2002-12-03 15:36:52 +00:00
Behrend Cornelius
cd8c3058dc #105161# common.jar added 2002-11-20 13:13:13 +00:00
Behrend Cornelius
32d656ba06 #95411# resource file common.res added 2002-10-15 13:48:39 +00:00
Sander Vesik
3cdaeef06b wizards also depends on javaunohelper 2002-08-26 17:38:55 +00:00