Changeset 603 for trunk


Ignore:
Timestamp:
Mar 11, 2017, 9:25:00 PM (5 years ago)
Author:
Gregg Young
Message:

Changes to build system to get LuGBM to build when building the entire package and to build the def files from templates.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r553 r603  
    1313# number representing the major version, minor version and revision accordingly.
    1414#
    15 VERSION         = 1.3.6
     15VERSION         = 1.40.0
     16GBMVERSION      = 1.44
    1617
    1718#
     
    2122# See also GENERATING DISTRIBUTION ARCHIVES in README.DEV for more information.
    2223#
    23 BUILD           = beta
     24BUILD           = GA
    2425
    2526#
     
    2829# By agreement, this number is 0 for "beta" builds and 1 for "GA" builds.
    2930#
    30 WPIBUILD        = 0
     31WPIBUILD        = 1
    3132
    3233#
    3334# Lucide version date in the format YYYY-MM-DD.
    3435#
    35 VERSIONDATE     = 2012-xx-xx
     36VERSIONDATE     = 2017-03-11
     37
     38#
     39# Lucide version time used in build level strings set to any valid time
     40#
     41VERSIONTIME     = 01:40:00
     42
     43#
     44# Lucide build machine
     45#
     46BUILDMACHINE    = ZOBOPEEP
    3647
    3748#------------------------------------------------------------------------------
     
    113124# Added to build the help files 2016-09-04 GKY
    114125override define TOOL__LINK_MISCBIN_CMDS 
    115                 $(QUIET)$(PATH_ROOT)/tools/wipfc.exe $(Lucide_en.hlp_SOURCES)
     126                $(QUIET)$(PATH_ROOT)/tools/wipfc.exe $(Lucide_en.hlp_SOURCES) 
    116127endef   
    117128# 2016-03-05 SHL
  • trunk/Lucide/gui/Makefile.kmk

    r595 r603  
    6161Lucide_dll_LIBS          = \
    6262        ludoc.lib \
    63         poppler-cpp_dll.a \
    6463#       U:\PMPrintf\PMPRINTF.LIB
    6564       
  • trunk/Lucide/plugins/Makefile.kmk

    r367 r603  
    1212include $(PATH_SUB_CURRENT)/lujpeg/Makefile.kmk
    1313include $(PATH_SUB_CURRENT)/ludjvu/Makefile.kmk
     14include $(PATH_SUB_CURRENT)/lugbm/Makefile.kmk
    1415
    1516include $(FILE_KBUILD_SUB_FOOTER)
  • trunk/Makefile.kmk

    r556 r603  
    2626
    2727LUCIDE_WIS       = $(PATH_PACKING)/wpi/lucide.wis
     28WIC              = N:\ecs\install\WARPIN\WIC.EXE
     29
     30LCD_DEF          = $(PATH_ROOT)/lucide/gui/lcd.def
     31LUCIDE1_DEF      = $(PATH_ROOT)/lucide/gui/lucide1.def
     32LUDJVU_DEF       = $(PATH_ROOT)/lucide/plugins/ludjvu/ludjvu.def
     33LUDOC_DEF        = $(PATH_ROOT)/lucide/plugins/ludoc/ludoc.def
     34LUJPEG_DEF       = $(PATH_ROOT)/lucide/plugins/lujpeg/lujpeg.def
     35LUPOPPLER_DEF    = $(PATH_ROOT)/lucide/plugins/lupoppler/lupoppler.def
     36LUGBM_DEF        = $(PATH_ROOT)/lucide/plugins/lugbm/lugbm_gcc.def
    2837
    2938OTHER_CLEAN     += $(LUCIDE_WPI) $(LUCIDE_ZIP) $(LUCIDE_WIS)
     39
     40#
     41# Fixme PACKING fails on missing def if this is enabled
     42#
     43
     44# OTHER_CLEAN   += $(LUDJVU_DEF) $(LUDOC_DEF) $(LUJPEG_DEF) $(LUPOPPLER_DEF) $(LCD_DEF) $(LUCIDE1_DEF)
     45
     46#
     47# Add target to build the def files from template set/update VERSION, VERSIONDATE
     48# VERSIONTIME and BUILDMACHINE in Config.kmk first. Always run kmk -B DEFINES to
     49# force them to rebuild.
     50#
     51
     52DEFINES: $(LUCIDE1_DEF) $(LCD_DEF) $(LUDJVU_DEF) $(LUDOC_DEF) $(LUJPEG_DEF) $(LUPOPPLER_DEF) $(LUGBM_DEF)
     53
     54$(LUCIDE1_DEF): lucide/gui/lucide1.def.tpl Config.kmk  | $$(call DIRDEP,$$(@D))
     55        $(call MSG_L1,Generating $@)
     56        $(QUIET)$(SED) \
     57                -e "s;\\\$${VERSION};$(VERSION);g" \
     58                -e "s;\\\$${VERSIONDATE};$(VERSIONDATE);g" \
     59                -e "s;\\\$${VERSIONTIME};$(VERSIONTIME);g" \
     60                -e "s;\\\$${BUILDMACHINE};$(BUILDMACHINE);g" \
     61                --output $@  $<
     62               
     63$(LCD_DEF): lucide/gui/lcd.def.tpl Config.kmk | $$(call DIRDEP,$$(@D))
     64        $(call MSG_L1,Generating $@)
     65        $(QUIET)$(SED) \
     66                -e "s;\\\$${VERSION};$(VERSION);g" \
     67                -e "s;\\\$${VERSIONDATE};$(VERSIONDATE);g" \
     68                -e "s;\\\$${VERSIONTIME};$(VERSIONTIME);g" \
     69                -e "s;\\\$${BUILDMACHINE};$(BUILDMACHINE);g" \
     70                --output $@  $<   
     71               
     72$(LUDJVU_DEF): Lucide/plugins/ludjvu/ludjvu.def.tpl Config.kmk | $$(call DIRDEP,$$(@D))
     73        $(call MSG_L1,Generating $@)
     74        $(QUIET)$(SED) \
     75                -e "s;\\\$${VERSION};$(VERSION);g" \
     76                -e "s;\\\$${VERSIONDATE};$(VERSIONDATE);g" \
     77                -e "s;\\\$${VERSIONTIME};$(VERSIONTIME);g" \
     78                -e "s;\\\$${BUILDMACHINE};$(BUILDMACHINE);g" \
     79                --output $@  $<   
     80$(LUDOC_DEF):  Lucide/plugins/ludoc/ludoc.def.tpl Config.kmk | $$(call DIRDEP,$$(@D))
     81        $(call MSG_L1,Generating $@)
     82        $(QUIET)$(SED) \
     83                -e "s;\\\$${VERSION};$(VERSION);g" \
     84                -e "s;\\\$${VERSIONDATE};$(VERSIONDATE);g" \
     85                -e "s;\\\$${VERSIONTIME};$(VERSIONTIME);g" \
     86                -e "s;\\\$${BUILDMACHINE};$(BUILDMACHINE);g" \
     87                --output $@  $<   
     88$(LUJPEG_DEF): Lucide/plugins/lujpeg/lujpeg.def.tpl  Config.kmk | $$(call DIRDEP,$$(@D))
     89        $(call MSG_L1,Generating $@)
     90        $(QUIET)$(SED) \
     91                -e "s;\\\$${VERSION};$(VERSION);g" \
     92                -e "s;\\\$${VERSIONDATE};$(VERSIONDATE);g" \
     93                -e "s;\\\$${VERSIONTIME};$(VERSIONTIME);g" \
     94                -e "s;\\\$${BUILDMACHINE};$(BUILDMACHINE);g" \
     95                --output $@  $<   
     96$(LUPOPPLER_DEF): Lucide/plugins/lupoppler/lupoppler.def.tpl Config.kmk | $$(call DIRDEP,$$(@D))
     97        $(call MSG_L1,Generating $@)
     98        $(QUIET)$(SED) \
     99                -e "s;\\\$${VERSION};$(VERSION);g" \
     100                -e "s;\\\$${VERSIONDATE};$(VERSIONDATE);g" \
     101                -e "s;\\\$${VERSIONTIME};$(VERSIONTIME);g" \
     102                -e "s;\\\$${BUILDMACHINE};$(BUILDMACHINE);g" \
     103                --output $@  $<   
     104$(LUGBM_DEF): Lucide/plugins/lugbm/lugbm.def.tpl Config.kmk | $$(call DIRDEP,$$(@D))
     105        $(call MSG_L1,Generating $@)
     106        $(QUIET)$(SED) \
     107                -e "s;\\\$${GBMVERSION};$(GBMVERSION);g" \
     108                -e "s;\\\$${VERSIONDATE};$(VERSIONDATE);g" \
     109                -e "s;\\\$${VERSIONTIME};$(VERSIONTIME);g" \
     110                -e "s;\\\$${BUILDMACHINE};$(BUILDMACHINE);g" \
     111                --output $@  $<   
    30112
    31113ifeq ($(IN_PACKING),)
     
    37119PACKING          = do_packing
    38120
    39 do_packing:
     121PACKING:
    40122        $(RM) -fR $(PATH_PACKING)
    41123        $(QUIET)$(MAKE) IN_PACKING=1 uninstall rebuild packing
     
    100182$(LUCIDE_WPI): $(LUCIDE_WIS) install
    101183        $(call MSG_L1,Packing $@)
    102         -$(QUIET)$(RM) -f $@
     184        $(QUIET)$(RM) -f $@
    103185        $(QUIET)echo > $(abspathex $(Lucide_wpi_1_INST),$(PATH_OUT)/dist)/lucide.fcf
    104         $(QUIET)wic -a $@ \
     186        $(QUIET)$(WIC) -a $@ \
    105187                $(foreach p,$(patsubst Lucide_wpi_%,%,$(filter Lucide_wpi_%,$(INSTALLS))),\
    106188                        $(p) -c$(abspathex $(Lucide_wpi_$(p)_INST),$(PATH_OUT)/dist) \*) \
    107                 -s $(LUCIDE_WIS)
     189                -s $(LUCIDE_WIS) -v
    108190
    109191$(LUCIDE_WIS): warpin/lucide.wis.tpl Config.kmk | $$(call DIRDEP,$$(@D))
Note: See TracChangeset for help on using the changeset viewer.