Changeset 3537


Ignore:
Timestamp:
Aug 23, 2007, 2:39:06 AM (18 years ago)
Author:
bird
Message:

Moved k* into kStuff.

Location:
trunk
Files:
10 deleted
84 copied
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/kStuff/Config.kmk

    r3388 r3537  
    22## @file
    33#
    4 # Top-level kBuild configuration.
     4# kBuild configuration for kStuff
    55#
    6 # Copyright (c) 2006 knut st. osmundsen <bird@anduin.net>
     6# Copyright (c) 2006-2007 knut st. osmundsen <bird@anduin.net>
    77#
    88#
    9 # This file is part of kNIX.
     9# This file is part of k*.
    1010#
    11 # kNIX is free software; you can redistribute it and/or modify
     11# k* is free software; you can redistribute it and/or modify
    1212# it under the terms of the GNU General Public License as published by
    1313# the Free Software Foundation; either version 2 of the License, or
    1414# (at your option) any later version.
    1515#
    16 # kNIX is distributed in the hope that it will be useful,
     16# k* is distributed in the hope that it will be useful,
    1717# but WITHOUT ANY WARRANTY; without even the implied warranty of
    1818# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    … …  
    2020#
    2121# You should have received a copy of the GNU General Public License
    22 # along with kNIX; if not, write to the Free Software
     22# along with k*; if not, write to the Free Software
    2323# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2424#
    … …  
    2626
    2727#
    28 # Add the packing pass.
    29 #
    30 PASSES         += PACKING
    31 #DEFAULT_PASSES += PACKING
    32 
    33 #
    3428# This is where we install during the build.
    3529#
    36 PATH_INS := $(PATH_OUT)/dist
    37 
    38 #
    39 # The /bin templates.
    40 #                                               
    41 TEMPLATE_bin = /bin/ programs.
    42 TEMPLATE_bin_TOOL = GCC3
    43 TEMPLATE_bin_TOOL.os2 = GCC3OMF
    44 TEMPLATE_bin_INST = bin/
    45 
    46 #
    47 # The /usr/bin templates.
    48 #
    49 TEMPLATE_usr.bin = /usr/bin/ programs.
    50 TEMPLATE_usr.bin_TOOL = GCC3
    51 TEMPLATE_usr.bin_TOOL.os2 = GCC3OMF
    52 TEMPLATE_usr.bin_INST = usr/bin/
    53 
    54 TEMPLATE_usr.bin.script = /usr/bin/ scripts
    55 TEMPLATE_usr.bin.script_INST = usr/bin/
    56 
    57 TEMPLATE_usr.bin.doc = /usr/bin/ program documentation.
    58 # 1: source  2: target  3: _INST  4: default ins path
    59 TEMPLATE_usr.bin.doc_INSTFUN = $(4)/usr/doc/$(subst .doc,,$(2))/$(notdir $(1))
    60 
    61 TEMPLATE_usr.bin.man = /usr/bin/ program manual page
    62 # 1: source  2: target  3: _INST  4: default ins path
    63 TEMPLATE_usr.bin.man_INSTFUN = $(4)/usr/man/man$(notdir $(subst .,/,$(1)))/$(notdir $(1)).gz
    64 # 1: source  2: destination, 3: target
    65 TEMPLATE_usr.bin.man_INSTALLER = gzip -9 -c $(1) > $(2)
    66 
    67 TEMPLATE_usr.bin.alp = /usr/bin/ libraries using alp as assembler.
    68 TEMPLATE_usr.bin.alp_TOOL = GCC3
    69 TEMPLATE_usr.bin.alp_TOOL.os2 = GCC3OMF
    70 TEMPLATE_usr.bin.alp_ASTOOL = ALP
    71 TEMPLATE_usr.bin.alp_ASFLAGS = -Sv:ALP
    72 TEMPLATE_usr.bin.alp_INST = usr/bin/
    73 
    74 #
    75 # The /usr/sbin templates.
    76 #
    77 TEMPLATE_usr.sbin = /usr/sbin/ programs.
    78 TEMPLATE_usr.sbin_TOOL = GCC3
    79 TEMPLATE_usr.sbin_TOOL.os2 = GCC3OMF
    80 TEMPLATE_usr.sbin_INST = usr/sbin/
    81 
    82 TEMPLATE_usr.sbin.script = /usr/sbin/ scripts
    83 TEMPLATE_usr.sbin.script_INST = usr/sbin/
    84 
    85 TEMPLATE_usr.sbin.doc = /usr/bin/ program documentation.
    86 # 1: source  2: target  3: _INST  4: default ins path
    87 TEMPLATE_usr.sbin.doc_INSTFUN = $(4)/usr/doc/$(subst .doc,,$(2))/$(notdir $(1))
    88 
    89 TEMPLATE_usr.sbin.man = /usr/bin/ program manual page
    90 # 1: source  2: target  3: _INST  4: default ins path
    91 TEMPLATE_usr.sbin.man_INSTFUN = $(4)/usr/man/man$(notdir $(subst .,/,$(1)))/$(notdir $(1)).gz
    92 # 1: source  2: destination, 3: target
    93 TEMPLATE_usr.sbin.man_INSTALLER = gzip -9 -c $(1) > $(2)
     30PATH_INS := $(PATH_OUT)/kStuff
    9431
    9532
    9633#
    97 # The /usr/include templates.
     34# Templates for the kStuff.
    9835#
    99 TEMPLATE_usr.include = /usr/include/ headers
    100 TEMPLATE_usr.include_INST = usr/include/
    101 TEMPLATE_usr.include_MODE = 644
     36TEMPLATE_kStuff = kStuff Template
     37TEMPLATE_kStuff_TOOL             = GCC3
     38TEMPLATE_kStuff_TOOL.os2         = GCC3OMF
     39TEMPLATE_kStuff_TOOL.win.x86     = VCC70
     40TEMPLATE_kStuff_TOOL.win.amd64   = VCC80AMD64
    10241
    103 TEMPLATE_usr.include.sys = /usr/include/sys/ headers
    104 TEMPLATE_usr.include.sys_INST = usr/include/sys/
    105 TEMPLATE_usr.include.sys_MODE = 644
     42TEMPLATE_kStuff_SDKS.win         = WINPSDK
     43
     44TEMPLATE_kStuff_DEFS.freebsd     = KS_OS_FREEBSD
     45TEMPLATE_kStuff_DEFS.linux       = KS_OS_LINUX
     46TEMPLATE_kStuff_DEFS.os2         = KS_OS_OS2
     47TEMPLATE_kStuff_DEFS.win         = KS_OS_WINDOWS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_WARNINGS
     48
     49TEMPLATE_kStuff_DEFS.x86         = KS_BITS=32
     50TEMPLATE_kStuff_DEFS.amd64       = KS_BITS=64
     51
     52TEMPLATE_kStuff_ASTOOL           = YASM
     53TEMPLATE_kStuff_ASTOOL.os2       = NASM
     54TEMPLATE_kStuff_ASFLAGS.freebsd  = -f elf
     55TEMPLATE_kStuff_ASFLAGS.linux    = -f elf
     56TEMPLATE_kStuff_ASFLAGS.os2      = -f omf
     57TEMPLATE_kStuff_ASFLAGS.win.x86  = -f win32 -g cv8
     58TEMPLATE_kStuff_ASFLAGS.win.amd64= -f win64 -g cv8
     59
     60TEMPLATE_kStuff_CXXFLAGS.freebsd = -g
     61TEMPLATE_kStuff_CXXFLAGS.linux   = -g
     62TEMPLATE_kStuff_CXXFLAGS.os2     = -g
     63TEMPLATE_kStuff_CXXFLAGS.win     = -Zi -Zl -MD -W3 -GF -GR-
     64ifneq ($(BUILD_TYPE),debug)
     65TEMPLATE_kStuff_CXXFLAGS.freebsd+= -O3
     66TEMPLATE_kStuff_CXXFLAGS.linux  += -O3
     67TEMPLATE_kStuff_CXXFLAGS.os2    += -O3
     68TEMPLATE_kStuff_CXXFLAGS.win    += -O2xtg -Oi -Ob2
     69endif
     70
     71TEMPLATE_kStuff_LDFLAGS.freebsd  = -g
     72TEMPLATE_kStuff_LDFLAGS.linux    = -g
     73TEMPLATE_kStuff_LDFLAGS.os2      = -g
     74TEMPLATE_kStuff_LDFLAGS.win      = /DEBUG
     75
     76TEMPLATE_kStuff_LIBS.freebsd     =
     77TEMPLATE_kStuff_LIBS.linux       =
     78TEMPLATE_kStuff_LIBS.os2         =
     79TEMPLATE_kStuff_LIBS.win         = \
     80        $(PATH_SDK_WINPSDK_LIB)/psapi.Lib
     81TEMPLATE_kStuff_LIBS.win.x86     = \
     82        $(PATH_TOOL_VCC70_LIB)/msvcrt.lib \
     83        $(PATH_TOOL_VCC70_LIB)/msvcprt.lib \
     84        $(PATH_TOOL_VCC70_LIB)/oldnames.lib
     85
     86TEMPLATE_kStuffEXE = kStuff Executable Template
     87TEMPLATE_kStuffEXE_EXTENDS = kStuff
     88TEMPLATE_kStuffEXE_DEFS = $(TEMPLATE_kStuff) KS_EXE_TARGET
     89
     90TEMPLATE_kStuffLIB = kStuff Library Template
     91TEMPLATE_kStuffLIB_EXTENDS = kStuff
     92TEMPLATE_kStuffLIB_DEFS = $(TEMPLATE_kStuff) KS_LIB_TARGET
     93
     94TEMPLATE_kStuffDLL = kStuff DLL Template
     95TEMPLATE_kStuffDLL_EXTENDS = kStuff
     96TEMPLATE_kStuffDLL_DEFS = $(TEMPLATE_kStuff) KS_DLL_TARGET
     97TEMPLATE_kStuffDLL_LDFLAGS.os2 = $(TEMPLATE_kStuff_LDFLAGS.os2) -Zdll
    10698
    10799
    108 #
    109 # The /usr/lib templates.
    110 #
    111 TEMPLATE_usr.lib = /usr/lib/ libraries.
    112 TEMPLATE_usr.lib_TOOL = GCC3
    113 TEMPLATE_usr.lib_TOOL.os2 = GCC3OMF
    114 TEMPLATE_usr.lib_INST = usr/lib/
    115 TEMPLATE_usr.lib_MODE = 644
    116 
    117 TEMPLATE_usr.lib.nasm = /usr/lib/ libraries using nasm as assembler.
    118 TEMPLATE_usr.lib.nasm_TOOL = GCC3
    119 TEMPLATE_usr.lib.nasm_TOOL.os2 = GCC3OMF
    120 TEMPLATE_usr.lib.nasm_ASTOOL = NASM
    121 TEMPLATE_usr.lib.nasm_ASFLAGS = -f obj
    122 TEMPLATE_usr.lib.nasm_INST = usr/lib/
    123 TEMPLATE_usr.lib.nasm_MODE = 644
    124 
    125 
    126 #
    127 # The generic data install template.
    128 #
    129 TEMPLATE_gendata = /usr/lib/ libraries.
    130 TEMPLATE_gendata_INST = /tmp
    131 TEMPLATE_gendata_MODE = 644
    132 
    133 
    134 #
    135 # The default way of packing.
    136 # We install to packages/<subdir>, then we zip up what's there.
    137 #
    138 PACKAGE_ZIP  ?= $(PATH_OUT)/packages/$(CURSUBDIR).zip
    139 PATH_PACKAGE ?= $(PATH_OUT)/packages/$(CURSUBDIR)
    140 PACKING      ?= defaultpacking
    141 defaultpacking:
    142         $(RM) -f "$(PACKAGE_ZIP)"
    143         $(RM) -Rf "$(PATH_PACKAGE)"
    144         +$(MAKE) "PATH_INS=$(PATH_PACKAGE)" install
    145         cd "$(PATH_PACKAGE)/" && zip -9r $(PATH_OUT)/packages/$(CURSUBDIR).zip *
    146 .NOTPARALLEL: defaultpacking
    147 # todo zip up the source and create a diff.
    148 

  • trunk/kStuff/kDbg/Makefile.kmk

    r3536 r3537  
    2525#
    2626
    27 DEPTH = ..
     27DEPTH = ../..
    2828include $(PATH_KBUILD)/header.kmk
    2929

  • trunk/kStuff/kLdr/Makefile.kmk

    r3536 r3537  
    2626
    2727
    28 DEPTH = ..
     28DEPTH = ../..
    2929include $(PATH_KBUILD)/header.kmk
    30 
    31 DEFAULT_PASSES := $(filter-out PACKING, $(DEFAULT_PASSES)) # annoying on windows.
    3230
    3331#

  • trunk/kStuff/kProfile/Makefile.kmk

    r3536 r3537  
    2525#
    2626
    27 DEPTH = ..
     27DEPTH = ../..
    2828include $(PATH_KBUILD)/header.kmk
    2929
Note: See TracChangeset for help on using the changeset viewer.