Commit Graph

165 Commits

Author SHA1 Message Date
Ingo Weinhold
6af7607485 Uh, rc does not always append .rsrc to the output file, but only if it is missing. Adjusted ResComp actions.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2741 a95241bf-73f2-0310-859d-f6bbb57e9c96
2003-02-17 17:15:14 +00:00
Ingo Weinhold
8d3308d9aa * Added a Bison and a LexC++ rule.
* Override the Jambase version of the Object rule to optionally generate
  intermediate .cpp instead of .c files for .y and .l input. The
  GENERATE_C++ variable must be set to enable that behavior.
* Added a ResComp rule using the shiny new rc to compile .rdef files into
  .rsrc files.
* Adjusted AddResources to accept both, .rsrc and .rdef files. The rule
  also grists the input files now, avoiding problems with equally named
  resource files in different directories.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2739 a95241bf-73f2-0310-859d-f6bbb57e9c96
2003-02-17 17:08:34 +00:00
Philippe Houdoin
f790124713 Allow to link shared objects against the pseudo image name _APP_ and _KERNEL_.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2456 a95241bf-73f2-0310-859d-f6bbb57e9c96
2003-01-14 21:44:58 +00:00
Axel Dörfler
a8687de4ad Added a _ASSEMBLER define in the assembler rule, so that we can differentiate
in a header if it was included from assembler or not (if anybody knows a better
way how to solve this, feel free to speak, I haven't found anything :).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2367 a95241bf-73f2-0310-859d-f6bbb57e9c96
2003-01-06 08:30:40 +00:00
Ingo Weinhold
9b60a208f3 Worked around a Jam problem: The ObjectHdrs rule doesn't adjust the HDRSEARCH variable and thus header files may not be found while header scanning.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2202 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-12-09 12:43:02 +00:00
beveloper
0ff867c242 if you specify DEBUG as environment variable, the DEBUG macro
will be defined with the same value.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2101 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-28 14:06:11 +00:00
Ingo Weinhold
fbd28219aa Merged in FreeType 2.1.2 -> 2.1.3 differences. Resolved conflicts.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2041 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-20 21:40:01 +00:00
Ingo Weinhold
4ff6d49f35 Added setting of the variables for header and jamfile cache files and moved BuildConfig into build/.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2026 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-20 00:46:04 +00:00
Ingo Weinhold
54b7cbe14d Now MergeObjectFromObjects adds grist to the to be merged objects.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1992 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-18 01:21:30 +00:00
shatty
cfc7b456d2 added missing E-mail header and updated os_includes
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1965 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-16 21:58:48 +00:00
Ingo Weinhold
dd9f80626c * Removed invocations of SetupIncludes for the unit tests and removed the
`-nostdinc' flag from the CCFLAGS and C++FLAGS in R5Objects. The R5 tests
  must be compiled with the system header.
* Introduced SetupR5Includes which simply clears HDRS.
* Fixed rule Filter.
* Removed some unnecessary `""' in CCFLAGS and C++FLAGS assignments.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1948 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-15 20:22:35 +00:00
Ingo Weinhold
d391d2eb6e Added AbsSymLink rule.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1941 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-14 23:09:18 +00:00
Axel Dörfler
807212446d Added new rules MergeObject, MergeObjectFromObjects, and KernelMergeObject.
Fixed the syntax comment in KernelLd.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1840 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-11-04 18:52:21 +00:00
beveloper
089a062916 avoid building too long command lines (still not perfect)
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1778 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-10-30 02:13:21 +00:00
beveloper
3b4190ab3f simplified, since SetupIncludes can now be called multiple times
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1707 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-10-26 22:12:48 +00:00
Daniel Reinhold
28d2a30e96 oops.. accidentally overwrote changes by Marcus -- they're back in now
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1693 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-10-26 20:23:12 +00:00
Daniel Reinhold
be36cedec2 added system private header 'libroot' so that headers/private/kernel doesn't become filled with non-kernel library stuff
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1692 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-10-26 20:13:01 +00:00
beveloper
c00c7b2eed changed once again to better handle global include directories
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1690 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-10-26 19:40:17 +00:00
beveloper
5906bda96f a bad hack to get cppunit testlibrary build
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1658 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-10-25 16:19:25 +00:00
beveloper
a6c008e1b9 modified to build without external BeOS headers on the host system
(well, nearly)


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1627 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-10-23 19:23:01 +00:00
Ingo Weinhold
21df594501 * MakeLocateObjects: The comment implied that the supplied file names
needed to be gristed, but actually all invocations supplied ungristed
  files. The rule does add grist itself now.
* Added SharedLibraryFromObjects rule.
* Fixed a serious bug in ObjectReference.
* Added rules and variables needed for building the FreeType2 library.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1489 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-10-12 15:15:38 +00:00
shatty
1419ae2b19 changed ordering of SetVersion and MimeSet to fix application version nuking.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1316 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-09-30 21:16:18 +00:00
beveloper
405439be5c unified Bochs debugging option
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1304 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-09-30 02:23:36 +00:00
Ingo Weinhold
6991af8cd8 A link created with RelSymLink is properly removed on a `jam clean\' now. Overrode the Clean actions to support spaces in file names.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1290 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-09-29 14:59:51 +00:00
Bruno G. Albuquerque
b1b72e8797 Automatically add the Bochs keyboard hack when --bochs-debug is used in the configure script.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1221 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-09-28 01:37:00 +00:00
Ingo Weinhold
7a384fde36 Extended the Addon rule by another parameter: <is executable>. Supply "true" to prevent the usage of the -nostart linker option.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1196 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-09-26 22:31:53 +00:00
Axel Dörfler
b005dbe305 Now adds the headers/os directory to all UsePublicHeader rules. It's mostly
done to fix some build issues (BeBuild.h).
If you have a better idea on how to solve this - or a different idea how things
should work, please go on :-)


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1117 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-09-22 23:54:06 +00:00
Ingo Weinhold
96d2746579 Now the environment variable NO_TEST_DEBUG can be set to make the rules
that build the tests NOT override the global optimization and debug
settings.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1065 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-09-16 22:21:37 +00:00
Tyler Dauwalder
c5ff4aa6f5 It became apparent that in order to assure obos tests are run
with obos libs and r5 tests are run with r5 libs, two separate
unit testing programs in different directories would be needed.
Thus UnitTester is now just a shell program that calls the
appropriate unittester/UnitTester or unittester_r5/UnitTester_r5
program.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@703 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-08-11 03:45:17 +00:00
Ingo Weinhold
9342c27ad7 Moved common code out of the *Test* rules and put it into separate rules (R5Objects, TestObjects).
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@617 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-08-06 22:10:59 +00:00
Matthew Wilber
4fb5add07a added the Translator rule for building Translators
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@597 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-08-06 00:48:49 +00:00
Ingo Weinhold
be5af1baf8 Added UseCppUnitObjectHeaders rule and replaced UseCppUnitHeaders by UseCppUnitObjectHeaders in unit testing rules. If more than one unit test was built, the cppunit headers were added several times. There are still flags appearing multiple times when compiling an object file that is used for more than one test. But that's not that urgent...
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@563 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-08-03 16:11:42 +00:00
Ingo Weinhold
94782cf761 Made the assemble rule more like As. Why do we need assemble anyway? Any reason not to use As?
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@421 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-24 18:13:59 +00:00
Ingo Weinhold
16fa4445b9 KEEPOBJS is set now. It makes the Library rule not remove the object files.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@419 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-24 17:46:02 +00:00
Axel Dörfler
7378dd7f78 Added padding to the floppy disk (for use with VMware) - could be moved
as default padding into the makeflop executable.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@327 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-19 02:38:35 +00:00
Tyler Dauwalder
9285de5124 + Started migrating Support Kit to new testing framework
+ Migrated BLocker tests.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@301 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-18 05:32:00 +00:00
Ingo Weinhold
0d1cdd942e DEPENDS -> Depends and a Depends -> LocalDepends in R5TestLib.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@270 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-17 11:46:16 +00:00
Tyler Dauwalder
d1f6c38f0d Unit testing update:
- Verbosity is now honored globally
- Added BTestCase::Outputf()
- Migrated BNode, BStatable, BDirectory, and BPath tests
- Added CommonTestLib, TestLib, and R5TestLib rules to Jamrules
- Updated Jamfiles for unit testing stuff
- Probably a few other things I've forgotten


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@269 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-17 10:50:55 +00:00
Ingo Weinhold
9eea452292 Huh, what happened? Didn't I commit my previous changes?
* Added section for compatibility with original Jam.
* Replaced Clean/Depends with LocalClean/LocalDepends where necessary.
* Added checking of the variable DEBUG. If set compile and link flags are
  adjusted to generate info for source level debugger.
* Fixed problem with object specific variable setting: VAR on target += value ;
  is equivalent with VAR on target = value ; if VAR has not been set on this
  target before, even if the global VAR is set. We need to be careful with
  CCFLAGS, LINKFLAGS, LINKLIBS and the like.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@259 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-16 23:25:46 +00:00
lillo
2b94bc7ba9 hopefully fixed the bochs debug issue
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@252 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-16 12:39:57 +00:00
Ingo Weinhold
8c27f58d89 SplitPath ran into an endless loop given absolute path.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@241 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-15 09:05:25 +00:00
Ingo Weinhold
0c0b2cd060 * Got rid off the third SystemMain parameter and by improving
BuildKernel and KernelFloppyImage. Now the kernel and the floppy image
  depend correctly on there generating tools.
* New InstallFloppy rule to simplify the process of building and writing
  the floppy image.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@225 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-14 22:08:01 +00:00
Ingo Weinhold
58efc9d865 Renamed KernelAddon to R5KernelAddon to avoid confusion.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@224 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-14 17:31:49 +00:00
Ingo Weinhold
af28904ff3 Fixed setting the target specific LINKFLAGS in Addon and SharedLibrary. Added the rule KernelAddon for, guess what, kernel add-ons. :-)
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@222 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-14 16:38:21 +00:00
Ingo Weinhold
9fc6b2e18b Added rules SimpleTest, PrependObjectHdrs and Filter. The latter one is not
longer needed though.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@181 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-13 20:37:40 +00:00
Ingo Weinhold
08125d0764 * Commented out SetupIncludes in StaticLibrary.
* Added rules ObjectReference and ObjectReferences which allow for using
  another identifier referring to an object. In particular useful in
  combination with...
* Added *.o case in UserObject rule. It does simply nothing. This lets
  you add objects to the list of sources for Objects or Main rules. Very
  nice, if you want to (re-)use an object built in another directory.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@178 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-13 16:50:16 +00:00
David Reid
13be49117f Use the new drivers dir for headers.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@170 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-12 23:29:42 +00:00
Ingo Weinhold
2a83bfb482 Adjusted the KernelConfigSection and WriteConfigFile rules. Now the former eats arbitrary targets. Adjusted KernelLd to make use of it.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@165 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-12 22:53:42 +00:00
Ingo Weinhold
1eb18edf5f Fixed the "" I accidentially introduced in the KernelLd. Also removed them
from $(LINKLIBS), but wrapped $(NEEDLIBS) instead.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@162 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-12 21:16:33 +00:00
Ingo Weinhold
0931b8f939 * Wrapped filenames in all actions in "".
* Added Chmod1 to wrap the filename in "".
* Added rule RelSymLink that makes it easier to create a relative symlink
  between two targets.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@143 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-12 18:46:53 +00:00
beveloper
e5dc2d93a3 Adding suport to see warnings at compile time.
I'm not sure if this is added in the correct way, please fix it.
As many files generate warnigs, it's inactive by default.

To compile with enabled warnings, execute jam like this:

$ WARNINGS=true jam


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@141 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-12 16:47:41 +00:00
David Reid
c63f4a88da I'd prefer to use <support/Errors.h> but that doesn't work and the
easiest way to fix it was to use <Errors.h> and simply include the
header path in our build line.

Can someone on the buidl team please try and tell us what path's
are/aren't being used? No doubt it'll take about 100 messages and
a lot of violent arguing, but then maybe sanity will prevail? :)


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@106 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-11 22:27:03 +00:00
Ingo Weinhold
f06de7f34f Added BinCommand and StdBinCommands rules.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@99 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-11 22:10:01 +00:00
David Reid
8059752e33 Add posix to kernel objects.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@81 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-11 14:58:03 +00:00
Ingo Weinhold
d25a77b4fe Added UsePosixHeaders and UsePosixObjectHeaders rules and added the POSIX headers in SetupIncludes.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@80 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-11 11:58:30 +00:00
Ingo Weinhold
f63877e7f7 No SetupIncludes in Server rule.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@49 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-10 19:25:15 +00:00
Ingo Weinhold
78599cf01d Changed build target directory to \*.R1 and simplified AddResources rule.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@45 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-10 17:54:11 +00:00
Ingo Weinhold
7d7f280ed3 * Uncommented SetupIncludes in Addon. Same reason as with the others.
* Reintroduced Axel's fix to the public header dirs.
* Pulled the functionality to set the headers on object files out of
  Use*Headers and put it into new rules Use*ObjectHeaders. The usage differed
  too much.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@42 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-10 16:35:13 +00:00
Axel Dörfler
acea35dd63 That was too fast: "os" is added in the sub-Jamfiles (although I don't think
that's a good solution). Fixed.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@41 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-10 15:57:36 +00:00
Axel Dörfler
e9625b4b51 The "os" directory was missing from the UsePublicHeaders rule.
BTW the last change of this file requires updating your OBOS_TOP variable
to the current tree.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@40 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-10 15:55:05 +00:00
Ingo Weinhold
4236d49041 Improved LinkSharedOSLibs. It does now look, if a supplied "library" has a dirname or grist, which makes the rule handle it as if the basename would start with "lib". Needed e.g. when linking against servers.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@37 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-10 15:11:24 +00:00
Ingo Weinhold
3b9eae39d5 * Turned off optimization for unit tests. The Storage Kit tests were running
amok...
* Added rules SplitPath and SymLink used in the Storage Kit tests Jamfile.
* Removed the setting of CCFLAGS and C++FLAGS on the SystemMain target.
  This really doesn't made sense.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@23 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-10 01:54:50 +00:00
Ingo Weinhold
c633961ad2 Adjusted the Use*Headers rules to reflect the new header dir structure.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@13 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-09 20:11:42 +00:00
ejakowatz
5f281ed502 Well, I couldn't go to bed without making *something* build ... ;)
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-09 13:40:32 +00:00
ejakowatz
52a3801208 It is accomplished ...
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-07-09 12:24:59 +00:00