Login
Changes On Branch build
Login
Patch Unified Diff

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch build Excluding Merge-Ins

This is equivalent to a diff from 17899dd3c5 to 64fe4e398f

2013-08-15
03:39
merged in [build] branch and fixed always-rebuild deps problem (dep on directory, which is of course always updated). check-in: 54e5c91754 user: stephan tags: trunk
2013-08-13
15:32
manifest parser now validates Z cards. check-in: be7a6ff9cb user: stephan tags: trunk
15:17
added missing/removed FSL.OBJ def. Closed-Leaf check-in: 64fe4e398f user: stephan tags: build
15:02
build now compiles library .o files to obj/ instead of src/. Edit: moved to new branch - this is causing a rebuild of all .o files each time. Don't know why. check-in: 1b7f163c07 user: stephan tags: build
15:02
doc additions. check-in: 17899dd3c5 user: stephan tags: trunk
14:15
doc lie correction. check-in: 5fc8458a63 user: stephan tags: trunk

Changes to Makefile.in. 
1
2
3
4
5
6
7
8
9
10
11
12
13
14

15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

32


33






34










35




36
37
38
39
40
41
42

#!/usr/bin/make # help out emacs
#
# Top-level autosetup-filtered Makefile for libfossil. This particular
# build is for Unix platforms with GNU Make 3.81+.
all:
include @top_srcdir@/config.make
ShakeNMake.CISH_SOURCES := $(wildcard *.c) $(wildcard src/*.c)
# Subdir cleanup rules must come before shakenmake.make is included.
clean: clean-th1ish
distclean: distclean-th1ish
include @top_srcdir@/shakenmake.make

AUTOCONFIG_H := @srcdir@/include/fossil-scm/autoconfig.h
SRCD := @top_srcdir@/src

FSL.SRC := $(addprefix $(SRCD)/,\
	fsl.c \
	fsl_appendf.c \
	fsl_bag.c \
	fsl_buffer.c \
	fsl_content.c \
	fsl_db.c \
	fsl_delta.c \
	fsl_encode.c \
	fsl_fs.c \
	fsl_leaf.c \
	fsl_md5.c \
	fsl_mf.c \
	fsl_pq.c \
	fsl_sha1.c \
	fsl_tag.c \
	fsl_utf8.c)




FSL.OBJ := $(subst .c,.o,$(FSL.SRC))

















CLEAN_FILES += $(SRCD)/*.o





EXTRA_LIBS := -lz -lsqlite3
test.BIN.LDFLAGS := -L. -lfossil @SH_LINKFLAGS@
libfossil.DLL.OBJECTS := $(FSL.OBJ)
libfossil.DLL.LDFLAGS := @SH_LDFLAGS@ $(EXTRA_LIBS)
libfossil.LIB.OBJECTS := $(libfossil.DLL.OBJECTS)
########################################################################














|
>
|















|
>

>
>
|
>
>
>
>
>
>

>
>
>
>
>
>
>
>
>
>
|
>
>
>
>








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66

#!/usr/bin/make # help out emacs
#
# Top-level autosetup-filtered Makefile for libfossil. This particular
# build is for Unix platforms with GNU Make 3.81+.
all:
include @top_srcdir@/config.make
ShakeNMake.CISH_SOURCES := $(wildcard *.c) $(wildcard src/*.c)
# Subdir cleanup rules must come before shakenmake.make is included.
clean: clean-th1ish
distclean: distclean-th1ish
include @top_srcdir@/shakenmake.make

AUTOCONFIG_H := @srcdir@/include/fossil-scm/autoconfig.h
#SRCDIR := @top_srcdir@/src
SRCDIR := @srcdir@/src
FSL.SRC.BASENAMES := \
	fsl.c \
	fsl_appendf.c \
	fsl_bag.c \
	fsl_buffer.c \
	fsl_content.c \
	fsl_db.c \
	fsl_delta.c \
	fsl_encode.c \
	fsl_fs.c \
	fsl_leaf.c \
	fsl_md5.c \
	fsl_mf.c \
	fsl_pq.c \
	fsl_sha1.c \
	fsl_tag.c \
	fsl_utf8.c
FSL.SRC := $(addprefix $(SRCDIR)/,$(FSL.SRC.BASENAMES))

########################################################################
# Set up building the main objects the $(OBJDIR).
OBJDIR := obj
$(OBJDIR):
	mkdir $@
DISTCLEAN_FILES += -r $(OBJDIR)
# Reminder to self: the fact that rm(1) on my system accepts -r
# in the middle of the file list somewhat surprises me, but it may
# be non-portable.

define ADD_C_TO_OBJ_DIR
# Set up rules for building dir/foo.c to $(OBJDIR)/foo.o
# $1 = input file. Must not be more than 1 subdir level
# deep (that would break these rules).
$(1).OBJ := $(OBJDIR)/$(basename $(notdir $(1))).o
$$($(1).OBJ): $(1)
	$(COMPILE.c) $(COMPILE.c.OPTIONS) -o $$($(1).OBJ) $(1)
FSL.OBJ += $$($(1).OBJ)
endef
$(foreach cfile,$(FSL.SRC),$(eval $(call ADD_C_TO_OBJ_DIR,$(cfile))))
CLEAN_FILES += $(FSL.OBJ)
$(FSL.OBJ): $(OBJDIR)

# End $(OBJDIR) bits.
########################################################################

EXTRA_LIBS := -lz -lsqlite3
test.BIN.LDFLAGS := -L. -lfossil @SH_LINKFLAGS@
libfossil.DLL.OBJECTS := $(FSL.OBJ)
libfossil.DLL.LDFLAGS := @SH_LDFLAGS@ $(EXTRA_LIBS)
libfossil.LIB.OBJECTS := $(libfossil.DLL.OBJECTS)
########################################################################
︙︙
Changes to auto.def.
︙︙
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153


set cFlags {-fPIC}

if {[opt-bool no-debug]} {
    msg-result "Non-debug build."
    set cFlags "$cFlags -O2"
} else {
    msg-result "Debug build enabled."
    set cFlags "$cFlags -g"
}

define CFLAGS $cFlags

if {[opt-bool shared]} {
    define shared 1








|








139
140
141
142
143
144
145
146
147
148
149
150
151
152
153


set cFlags {-fPIC}

if {[opt-bool no-debug]} {
    msg-result "Non-debug build."
    set cFlags "$cFlags -O2"
} else {
    msg-result "Debug build enabled. Use --no-debug to build in non-debug mode."
    set cFlags "$cFlags -g"
}

define CFLAGS $cFlags

if {[opt-bool shared]} {
    define shared 1
︙︙
Changes to th1ish/Makefile.in. 
1
2
3
4
5
6
7
8


9
10

11
12
13
14
15
16
17

all:
include ../subdir-inc.make
#$(error $(TOP_INCDIR))
#CPPFLAGS += -I$(TOP_INCDIR)
CPPFLAGS += -I$(TOP_DIR)/include
#INCLUDES_PATH ?= $(HOME)/include /usr/local/include /usr/include

FOSSIL.LIB := ../libfossil.a


$(FOSSIL.LIB):
	$(MAKE) -C ..


########################################################################
# INC_SEARCH: $(call)able function. $(1) should be the the name of
# a C header file to search for under $(INCLUDES_PATH).
define INC_SEARCH
$(call ShakeNMake.CALL.FIND_FILE,$(1),$(INCLUDES_PATH))
endef









>
>


>








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

all:
include ../subdir-inc.make
#$(error $(TOP_INCDIR))
#CPPFLAGS += -I$(TOP_INCDIR)
CPPFLAGS += -I$(TOP_DIR)/include
#INCLUDES_PATH ?= $(HOME)/include /usr/local/include /usr/include

FOSSIL.LIB := ../libfossil.a

ifeq (,$(strip $(filter distclean clean,$(MAKECMDGOALS))))
$(FOSSIL.LIB):
	$(MAKE) -C ..
endif

########################################################################
# INC_SEARCH: $(call)able function. $(1) should be the the name of
# a C header file to search for under $(INCLUDES_PATH).
define INC_SEARCH
$(call ShakeNMake.CALL.FIND_FILE,$(1),$(INCLUDES_PATH))
endef
︙︙