Commit graph

1417 commits

Author SHA1 Message Date
Nicola Pero
face05f9f7 Converted the %.variables rule to the standard indentation ... it's now
enough easy not to require custom indentation :-)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13042 72102866-910b-0410-8b05-ffd578937521
2002-03-07 16:35:56 +00:00
Nicola Pero
e2539bd975 Further cleanup of general Master/Instance framework, removing more
variables from the submake invocation; removed unused variable


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13041 72102866-910b-0410-8b05-ffd578937521
2002-03-07 16:23:38 +00:00
Nicola Pero
7e88369c54 Do not pass down to the Instance make invocation variables which the
Instance invocation can better determine by itself.  Removed unused variable


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13040 72102866-910b-0410-8b05-ffd578937521
2002-03-07 16:22:09 +00:00
Nicola Pero
6f25c49744 Include Instance/rules.make sooner; remove unused variable SUBPROJECT_ROOT_DIR
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13039 72102866-910b-0410-8b05-ffd578937521
2002-03-07 16:21:12 +00:00
Nicola Pero
14cfca5492 Define DLL_DEF here
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13038 72102866-910b-0410-8b05-ffd578937521
2002-03-07 16:20:33 +00:00
Nicola Pero
5ee95b8912 Set up library additional flags here
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13037 72102866-910b-0410-8b05-ffd578937521
2002-03-07 16:20:00 +00:00
Nicola Pero
7b2a28076e Better, simpler management of MAIN_MODEL_FILE
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13036 72102866-910b-0410-8b05-ffd578937521
2002-03-07 15:20:18 +00:00
Nicola Pero
d7a67b4aaf Tidied up management of MAIN_MODEL_FILE variable
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13025 72102866-910b-0410-8b05-ffd578937521
2002-03-06 12:26:12 +00:00
Nicola Pero
36444742ee Do not pass down MAIN_MODEL_FILE
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13024 72102866-910b-0410-8b05-ffd578937521
2002-03-06 12:25:31 +00:00
Nicola Pero
9f267eb36b Set MAIN_MODEL_FILE here, simplified code to set it in the info plist
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13023 72102866-910b-0410-8b05-ffd578937521
2002-03-06 12:25:03 +00:00
Nicola Pero
1ca6088f9d Patch to avoid recompiling everything for minor version updates on Darwin
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13022 72102866-910b-0410-8b05-ffd578937521
2002-03-06 11:51:06 +00:00
Nicola Pero
b49297675b Fixed tricky problem in the new code copying resources from subprojects
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13016 72102866-910b-0410-8b05-ffd578937521
2002-03-05 18:10:55 +00:00
Nicola Pero
238d7665ad Fixed tricky problem when copying resources from a subproject ... * being
expanded to itself in the shell if no matching file exists!


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13015 72102866-910b-0410-8b05-ffd578937521
2002-03-05 18:10:28 +00:00
Nicola Pero
ce085f7c20 Tidied minor variable setting in bundle.make instance
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13010 72102866-910b-0410-8b05-ffd578937521
2002-03-05 17:19:07 +00:00
Nicola Pero
cca04168f4 Use =, not :=, to define BUNDLE_INSTALL_DIR
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13009 72102866-910b-0410-8b05-ffd578937521
2002-03-05 17:17:03 +00:00
Nicola Pero
913ca01bd2 Added comment
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13008 72102866-910b-0410-8b05-ffd578937521
2002-03-05 17:15:55 +00:00
Nicola Pero
02b37ccad3 Fixed setting GNUSTEP_USER_ROOT in case GNUSTEP_FLATTENED
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13007 72102866-910b-0410-8b05-ffd578937521
2002-03-05 16:43:24 +00:00
Nicola Pero
6fa2c09625 Finally got around to not pass down resource variables to submakes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13006 72102866-910b-0410-8b05-ffd578937521
2002-03-05 16:02:46 +00:00
Nicola Pero
171064593c Do not use override when defining resource variables
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13005 72102866-910b-0410-8b05-ffd578937521
2002-03-05 16:02:08 +00:00
Nicola Pero
183fed695c Do not pass down to submakes variables that the submakes can find out themselves
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13004 72102866-910b-0410-8b05-ffd578937521
2002-03-05 16:01:32 +00:00
Nicola Pero
bf58c41944 Generalized subproject resource code to work with projects different
from frameworks; concurrent major simplification in that area


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13003 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:54:11 +00:00
Nicola Pero
396d9ce463 clean the subproject resource dir
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13002 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:53:23 +00:00
Nicola Pero
dd9e147925 Use Instance/Shared/bundle.make to manage resources - this generalizes a lot
the resource code to work for any owning project type.  framework resource code
- which only works for frameworks - removed.  tidied up header build code


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13001 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:51:49 +00:00
Nicola Pero
402584428e Copy resources from subprojects into our main resource bundle
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13000 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:50:37 +00:00
Nicola Pero
52bad64da4 Finally got into the tidy up state for HEADER variables
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12999 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:14:24 +00:00
Nicola Pero
b0d4108bd3 Do not use override when defining HEADER variables
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12998 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:13:56 +00:00
Nicola Pero
9abe2ed368 Tidied setting up HEADER_FILES* variables - do not pass to submake, each
instance makefile sets them up separately


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12997 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:11:34 +00:00
Nicola Pero
6b0088fe3c Do not pass to submakes the HEADER_FILES* variables
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12996 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:10:33 +00:00
Nicola Pero
81b43c75a5 Define HEADER_FILES here
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12995 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:09:58 +00:00
Nicola Pero
0e64817ff0 Tidied
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12994 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:09:05 +00:00
Nicola Pero
03808c55f1 Major simplification of framework.make; added HAS_LN_S; define instance
variables locally in gswapp.make


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12993 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:04:10 +00:00
Nicola Pero
8106e91677 Define HAS_LN_S
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12992 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:03:12 +00:00
Nicola Pero
fa5227f60c Define here variables not expecting Master/rules.make to prepare them
for us


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12991 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:02:46 +00:00
Nicola Pero
89afab5efe Use Instance/Shared/bundle.make to build the bundle resources
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12990 72102866-910b-0410-8b05-ffd578937521
2002-03-05 15:02:12 +00:00
Nicola Pero
6d07051595 Prepared Instance/Shared/bundle.make for mass usage
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12989 72102866-910b-0410-8b05-ffd578937521
2002-03-05 14:27:58 +00:00
Nicola Pero
d7ad830eab Updated for change in Shared/Instance/bundle.make
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12988 72102866-910b-0410-8b05-ffd578937521
2002-03-05 14:27:06 +00:00
Nicola Pero
809027fc0e Added support for building gsweb stuff; renamed stuff to prepare for mass
usage


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12987 72102866-910b-0410-8b05-ffd578937521
2002-03-05 14:25:16 +00:00
Nicola Pero
6cf6514cba Added localized resource support to resource-set.make, fixed bugs in there
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12986 72102866-910b-0410-8b05-ffd578937521
2002-03-05 12:16:04 +00:00
Nicola Pero
b865b10502 Added localized resource file support ... fixed a couple of bugs
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12985 72102866-910b-0410-8b05-ffd578937521
2002-03-05 12:14:27 +00:00
Nicola Pero
265ba51d09 resource-set.make now doesn't even process subprojects on make all, clean,
distclean


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12984 72102866-910b-0410-8b05-ffd578937521
2002-03-05 11:35:56 +00:00
Nicola Pero
87b6831318 Do absolutely nothing on all, clean and distclean
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12983 72102866-910b-0410-8b05-ffd578937521
2002-03-05 11:35:10 +00:00
Nicola Pero
ca131efe6c Renamed WebServerResources to Resources/WebServer to allow further development
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12982 72102866-910b-0410-8b05-ffd578937521
2002-03-05 11:18:35 +00:00
Nicola Pero
fbed155a82 Renamed WebServerResources bundle dir to Resources/WebServer
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12981 72102866-910b-0410-8b05-ffd578937521
2002-03-05 11:17:48 +00:00
Nicola Pero
86c3d97817 New resource-set.make makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12973 72102866-910b-0410-8b05-ffd578937521
2002-03-04 18:32:25 +00:00
Richard Frith-Macdonald
3631628d2f Tidyup
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12947 72102866-910b-0410-8b05-ffd578937521
2002-03-02 06:58:33 +00:00
Richard Frith-Macdonald
dc35573d2d Reflect new path stuff.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12945 72102866-910b-0410-8b05-ffd578937521
2002-03-01 17:19:10 +00:00
Richard Frith-Macdonald
65c6400de7 Made path handling much more configurable
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12943 72102866-910b-0410-8b05-ffd578937521
2002-03-01 16:47:45 +00:00
Nicola Pero
383b3ae631 Fixed typo in last ChangeLog entry
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12941 72102866-910b-0410-8b05-ffd578937521
2002-03-01 15:37:06 +00:00
Nicola Pero
e8dc35e081 In Instance service.make, use shared code install resources in the bundle
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12940 72102866-910b-0410-8b05-ffd578937521
2002-03-01 15:36:13 +00:00
Nicola Pero
e66ee23f26 Updated to use Instance/Shared/bundle.make to manage the bundle resources
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12939 72102866-910b-0410-8b05-ffd578937521
2002-03-01 15:35:25 +00:00