Menu
▾
▴
toc-cvstree — cvs mails go here (potentially high-traffic)
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(12) |
Jun
(4) |
Jul
(2) |
Aug
(290) |
Sep
(111) |
Oct
(17) |
Nov
(27) |
Dec
(138) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(49) |
Feb
(3) |
Mar
(9) |
Apr
(3) |
May
(38) |
Jun
(17) |
Jul
|
Aug
(8) |
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
| 2007 |
Jan
|
Feb
(17) |
Mar
|
Apr
|
May
(1) |
Jun
(19) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(8) |
Nov
(3) |
Dec
|
| 2008 |
Jan
(5) |
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sg...@us...> - 2009-07-08 18:35:22
|
Revision: 122
http://toc.svn.sourceforge.net/toc/?rev=122&view=rev
Author: sgbeal
Date: 2009-07-08 18:35:20 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Enabled demo of "bad" code.
Modified Paths:
--------------
make-book/trunk/code/rmoo/Makefile
Modified: make-book/trunk/code/rmoo/Makefile
===================================================================
--- make-book/trunk/code/rmoo/Makefile 2009-07-08 18:24:41 UTC (rev 121)
+++ make-book/trunk/code/rmoo/Makefile 2009-07-08 18:35:20 UTC (rev 122)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# Demonstration file for rmoo.make
-default: demo
+default: all
include rmoo.make
$(call rmoo-define, file-info, \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2009-07-08 18:24:46
|
Revision: 121
http://toc.svn.sourceforge.net/toc/?rev=121&view=rev
Author: sgbeal
Date: 2009-07-08 18:24:41 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Minor layout corrections.
Modified Paths:
--------------
make-book/trunk/ManagingProjectsWithGNUMake-3.1.x.odt
Modified: make-book/trunk/ManagingProjectsWithGNUMake-3.1.x.odt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2009-07-08 18:23:40
|
Revision: 120
http://toc.svn.sourceforge.net/toc/?rev=120&view=rev
Author: sgbeal
Date: 2009-07-08 18:23:34 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Minor output file renaming.
Modified Paths:
--------------
trunk/toc2/make/doxygen.make
Modified: trunk/toc2/make/doxygen.make
===================================================================
--- trunk/toc2/make/doxygen.make 2009-07-08 18:22:26 UTC (rev 119)
+++ trunk/toc2/make/doxygen.make 2009-07-08 18:23:34 UTC (rev 120)
@@ -31,7 +31,7 @@
doxygen.index = Doxygen-index.txt
package.dist_files += $(doxygen.doxyfile.at) $(doxygen.index)
-doxygen.install-dir.basename ?= doxygen-$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+doxygen.install-dir.basename ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-doxygen
docs: doxygen
install: install-doxygen
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2009-07-08 18:22:28
|
Revision: 119
http://toc.svn.sourceforge.net/toc/?rev=119&view=rev
Author: sgbeal
Date: 2009-07-08 18:22:26 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Minor doc correction.
Modified Paths:
--------------
trunk/toc2/make/c-bins.make
Modified: trunk/toc2/make/c-bins.make
===================================================================
--- trunk/toc2/make/c-bins.make 2008-09-24 15:06:35 UTC (rev 118)
+++ trunk/toc2/make/c-bins.make 2009-07-08 18:22:26 UTC (rev 119)
@@ -11,8 +11,8 @@
# c-bins.OBJECTS (optional - list of .o files to link to all c-bins.list)
#
# For each FOO in c-bins, define:
-# FOO.bin.OBJECTS = list of .o files for FOO
-# FOO.bin.LDADD = optional arguments to pass to linker, e.g. -lstdc++
+# FOO.BIN.OBJECTS = list of .o files for FOO
+# FOO.BIN.LDADD = optional arguments to pass to linker, e.g. -lstdc++
#
# Reminder: when linking binaries which will use dlopen() at some point, you
# should add -rdynamic to the xxx.bin.LDADD flags. Without this, symbols won't be
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2008-09-24 15:06:47
|
Revision: 118
http://toc.svn.sourceforge.net/toc/?rev=118&view=rev
Author: sgbeal
Date: 2008-09-24 15:06:35 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
i think i've got parallel builds working now :)
Modified Paths:
--------------
trunk/toc2/make/symlink-files.make
trunk/toc2/make/toc2-subdirs.make
Modified: trunk/toc2/make/symlink-files.make
===================================================================
--- trunk/toc2/make/symlink-files.make 2008-09-21 12:11:23 UTC (rev 117)
+++ trunk/toc2/make/symlink-files.make 2008-09-24 15:06:35 UTC (rev 118)
@@ -18,14 +18,19 @@
$(error You must define both symlink-files.dest before including this makefile.)
endif
+symlink-files.dest.list := $(addprefix $(symlink-files.dest)/,$(symlink-files.list))
symlink-files.makefile := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-
-symlink-files: FORCE
- @$(call toc2.call.install-symlink,$(symlink-files.list),$(symlink-files.dest),-m 0644)
+$(symlink-files.makefile):
+$(symlink-files.dest.list):
+ @$(call toc2.call.install-symlink,$(notdir $@),$(symlink-files.dest),-m 0644)
+# @echo "Symlinking $@"; test -L "$@" && rm "$@"; ln -s "$${PWD}/$(notdir $@)" "$@"
+symlink-files: $(symlink-files.dest.list)
+# @$(call toc2.call.install-symlink,$(symlink-files.list),$(symlink-files.dest),-m 0644)
symlink-files.list: symlink-files
symlink-files-clean: FORCE
@echo "Cleaning symlinks."
- @-touch foo.cleanlocal; rm foo.cleanlocal $(wildcard $(addprefix $(symlink-files.dest)/,$(symlink-files.list)))
+ @-touch foo.cleanlocal; rm foo.cleanlocal $(wildcard $(symlink-files.dest.list))
+.PHONY: symlink-files-clean symlink-files
clean-.: symlink-files-clean
distclean-.: symlink-files-clean
Modified: trunk/toc2/make/toc2-subdirs.make
===================================================================
--- trunk/toc2/make/toc2-subdirs.make 2008-09-21 12:11:23 UTC (rev 117)
+++ trunk/toc2/make/toc2-subdirs.make 2008-09-24 15:06:35 UTC (rev 118)
@@ -51,11 +51,11 @@
cd $$pwd || exit; \
done
-.PHONY: subdirs $(package.subdirs)
+.PHONY: subdirs $(package.subdirs) $(patsubst %,subdir-%,$(package.subdirs))
$(package.subdirs):
- @$(call toc2.call.make-subdirs,$@,all)
+ @+$(call toc2.call.make-subdirs,$@,all)
subdirs: $(package.subdirs)
subdir-%:# run all in subdir $*
- @$(call toc2.call.make-subdirs,$*,all)
+ @+$(call toc2.call.make-subdirs,$*,all)
subdirs-%:# run target % in $(package.subdirs)
- @$(call toc2.call.make-subdirs,$(package.subdirs),$*)
+ @+$(call toc2.call.make-subdirs,$(package.subdirs),$*)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2008-09-21 12:11:40
|
Revision: 117
http://toc.svn.sourceforge.net/toc/?rev=117&view=rev
Author: sgbeal
Date: 2008-09-21 12:11:23 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
reordered LDFLAGS for *.BIN rules
Modified Paths:
--------------
make-book/trunk/code/ShakeNMake/shake-n-make.make
Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make 2008-04-24 22:22:09 UTC (rev 116)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make 2008-09-21 12:11:23 UTC (rev 117)
@@ -459,8 +459,9 @@
$$(CFLAGS) $$($(1).BIN.CFLAGS) \
$$(CXXFLAGS) $$($(1).BIN.CXXFLAGS) \
$$(CPPFLAGS) $$($(1).BIN.CPPFLAGS) \
- $$($(1).BIN.OBJECTS) $$($(1).BIN.SOURCES) \
- $$(LDFLAGS) $$($(1).BIN.LDFLAGS)
+ $$(LDFLAGS) $$($(1).BIN.LDFLAGS) \
+ $$($(1).BIN.OBJECTS) $$($(1).BIN.SOURCES)
+
# note about 'set -x': i do this because it normalizes backslashed
# newline, extra spaces, and other oddities of formatting.
endef
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2008-04-24 22:22:07
|
Revision: 116
http://toc.svn.sourceforge.net/toc/?rev=116&view=rev
Author: sgbeal
Date: 2008-04-24 15:22:09 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
fixed the previous broken fix for DESTDIR and DLLs
Modified Paths:
--------------
trunk/toc2/make/makerules.c-dlls
trunk/toc2/make/toc2-install.make
Modified: trunk/toc2/make/makerules.c-dlls
===================================================================
--- trunk/toc2/make/makerules.c-dlls 2008-04-24 22:09:32 UTC (rev 115)
+++ trunk/toc2/make/makerules.c-dlls 2008-04-24 22:22:09 UTC (rev 116)
@@ -39,7 +39,7 @@
${t}.DLL: \$(${t}.DLL)
endif
${t}.DLL.DO_INSTALL ?= \$(c-dlls.DO_INSTALL)
-${t}.DLL.INSTALL_DEST ?= \$(DESTDIR)/\$(package.install.dlls.dest)
+${t}.DLL.INSTALL_DEST ?= \$(package.install.dlls.dest)
ifeq (1,\$(${t}.DLL.DO_INSTALL))
# ^^^ disable install if ${t}.DLL.DO_INSTALL is set to non-1 value
Modified: trunk/toc2/make/toc2-install.make
===================================================================
--- trunk/toc2/make/toc2-install.make 2008-04-24 22:09:32 UTC (rev 115)
+++ trunk/toc2/make/toc2-install.make 2008-04-24 22:22:09 UTC (rev 116)
@@ -110,10 +110,10 @@
# easily/reliably make a relative path from the target directory back to
# the install source:
toc2.call.install-symlink = $(call toc2.call.install.grep_kludge,$(1)); \
- test -d $(2) || mkdir -p "$(2)" || \
- { err=$$?; echo "$(@): mkdir -p $(2) failed"; exit $$err; }; \
+ root=$(DESTDIR)$(2); test -d $$root || mkdir -p "$$root" || \
+ { err=$$?; echo "$(@): mkdir -p $$root failed"; exit $$err; }; \
for b in $(1) ""; do test -z "$$b" && continue; \
- target=$(2)/$$b; \
+ target=$$root/$$b; \
test $$target -ef $$b && continue; \
echo "Symlinking $$target"; ln -s -f $$PWD/$$b $$target || exit $$?; \
done
@@ -125,15 +125,16 @@
# $2-4 = Major, Minor, Patch version numbers
# $5 = destination directory
toc2.call.install-dll = $(call toc2.call.install.grep_kludge,$(1)); \
- test -d $(5) || mkdir -p $(5) || exit; \
+ root=$(DESTDIR)$(5); \
+ test -d $$root || mkdir -p $$root || exit; \
wholename=$(1).$(2).$(3).$(4); \
- target=$(5)/$$wholename; \
+ target=$$root/$$wholename; \
test $$wholename -ef $$target || { \
echo "Installing/symlinking $$target"; \
cmd="$(toc2.bins.installer) -s $$wholename $$target"; \
$$cmd || { x=$$?; echo "Install of $$wholename failed"; exit $$x; } \
}; \
- cd $(5); \
+ cd $$root; \
for i in $(1) $(1).$(2) $(1).$(2).$(3); do \
test -e $$i && rm -f $$i; \
cmd="ln -fs $$wholename $$i"; echo $$cmd; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2008-04-24 22:09:26
|
Revision: 115
http://toc.svn.sourceforge.net/toc/?rev=115&view=rev
Author: sgbeal
Date: 2008-04-24 15:09:32 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
imported fixes from the s11n tree
Modified Paths:
--------------
trunk/toc2/make/makerules.c-dlls
trunk/toc2/make/toc2-install.make
Modified: trunk/toc2/make/makerules.c-dlls
===================================================================
--- trunk/toc2/make/makerules.c-dlls 2008-01-23 14:57:46 UTC (rev 114)
+++ trunk/toc2/make/makerules.c-dlls 2008-04-24 22:09:32 UTC (rev 115)
@@ -39,7 +39,7 @@
${t}.DLL: \$(${t}.DLL)
endif
${t}.DLL.DO_INSTALL ?= \$(c-dlls.DO_INSTALL)
-${t}.DLL.INSTALL_DEST ?= \$(package.install.dlls.dest)
+${t}.DLL.INSTALL_DEST ?= \$(DESTDIR)/\$(package.install.dlls.dest)
ifeq (1,\$(${t}.DLL.DO_INSTALL))
# ^^^ disable install if ${t}.DLL.DO_INSTALL is set to non-1 value
Modified: trunk/toc2/make/toc2-install.make
===================================================================
--- trunk/toc2/make/toc2-install.make 2008-01-23 14:57:46 UTC (rev 114)
+++ trunk/toc2/make/toc2-install.make 2008-04-24 22:09:32 UTC (rev 115)
@@ -131,13 +131,13 @@
test $$wholename -ef $$target || { \
echo "Installing/symlinking $$target"; \
cmd="$(toc2.bins.installer) -s $$wholename $$target"; \
- $$cmd || exit $$?; \
+ $$cmd || { x=$$?; echo "Install of $$wholename failed"; exit $$x; } \
}; \
cd $(5); \
for i in $(1) $(1).$(2) $(1).$(2).$(3); do \
test -e $$i && rm -f $$i; \
cmd="ln -fs $$wholename $$i"; echo $$cmd; \
- $$cmd || exit $$?; \
+ $$cmd || { x=$$?; echo "Symlinking of $$wholename --> $$i failed"; exit $$x; } \
done
## symlinking method number 2:
## { set -x; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2008-01-23 14:58:39
|
Revision: 114
http://toc.svn.sourceforge.net/toc/?rev=114&view=rev
Author: sgbeal
Date: 2008-01-23 06:57:46 -0800 (Wed, 23 Jan 2008)
Log Message:
-----------
minor corrections
Modified Paths:
--------------
trunk/toc2/sbin/toc2_bootstrap.sh
Modified: trunk/toc2/sbin/toc2_bootstrap.sh
===================================================================
--- trunk/toc2/sbin/toc2_bootstrap.sh 2008-01-23 14:55:54 UTC (rev 113)
+++ trunk/toc2/sbin/toc2_bootstrap.sh 2008-01-23 14:57:46 UTC (rev 114)
@@ -49,15 +49,15 @@
}
TOC2_TOP_SRCDIR=${PWD}
-TOC2_HOME=${TOC2_HOME-"${TOC2_TOP_SRCDIR}/toc"}
+TOC2_HOME=${TOC2_HOME-"${TOC2_TOP_SRCDIR}/toc2"}
test -d "${TOC2_HOME}" || {
- echo "The toc home directory, TOC2_HOME, not found. Set that variable to the top-most path to your toc installation, or unset it to use the default of ./toc"
+ echo "The toc home directory, TOC2_HOME, not found. Set that variable to the top-most path to your toc installation, or unset it to use the default of ./toc2"
exit 4
}
export TOC2_TOP_SRCDIR
export TOC2_HOME
-export PATH=${TOC2_HOME}/bin:${PATH}
+export PATH="${TOC2_HOME}/bin:${PATH}"
{ # set up the core
CORE_SH=${TOC2_HOME}/sbin/toc2_core.sh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2008-01-23 14:58:23
|
Revision: 113
http://toc.svn.sourceforge.net/toc/?rev=113&view=rev
Author: sgbeal
Date: 2008-01-23 06:55:54 -0800 (Wed, 23 Jan 2008)
Log Message:
-----------
added toc2_bootstrap.sh to dist
Modified Paths:
--------------
trunk/toc2/sbin/Makefile
Modified: trunk/toc2/sbin/Makefile
===================================================================
--- trunk/toc2/sbin/Makefile 2008-01-21 17:53:47 UTC (rev 112)
+++ trunk/toc2/sbin/Makefile 2008-01-23 14:55:54 UTC (rev 113)
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
include toc2.make
-package.dist_files += toc2_core.sh toconfigure configure.sample
+package.dist_files += toc2_core.sh toc2_bootstrap.sh configure.sample
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2008-01-21 17:54:24
|
Revision: 112
http://toc.svn.sourceforge.net/toc/?rev=112&view=rev
Author: sgbeal
Date: 2008-01-21 09:53:47 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
brought example script up to date
Modified Paths:
--------------
trunk/toc2/sbin/configure.sample
Modified: trunk/toc2/sbin/configure.sample
===================================================================
--- trunk/toc2/sbin/configure.sample 2008-01-11 20:23:23 UTC (rev 111)
+++ trunk/toc2/sbin/configure.sample 2008-01-21 17:53:47 UTC (rev 112)
@@ -3,11 +3,10 @@
# must be filesystem-friendly (i.e., only alph-numeric, dots and underscores)
# because they are used to create various files (e.g. mypackage-1.0.7.tar.gz)
-PACKAGE_NAME=ExamplePackageName
-PACKAGE_VERSION=$(date +%Y%m%d)
-export PACKAGE_NAME PACKAGE_VERSION
+export PACKAGE_NAME=ExamplePackageName
+export PACKAGE_VERSION=$(date +%Y%m%d)
# toconfigure kicks off the core toc process, which eventually calls
# configure.${PACKAGE_NAME}. Do all of your package-specific
# checks in configure.${PACKAGE_NAME}.
-. toc/sbin/toconfigure $@
+. ${TOC2_HOME-toc2}/sbin/toc2_bootstrap.sh $@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2008-01-11 20:23:24
|
Revision: 111
http://toc.svn.sourceforge.net/toc/?rev=111&view=rev
Author: sgbeal
Date: 2008-01-11 12:23:23 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
minor fixes and touches-up
Modified Paths:
--------------
make-book/trunk/code/ShakeNMake/shake-n-make.make
Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make 2008-01-04 18:47:20 UTC (rev 110)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make 2008-01-11 20:23:23 UTC (rev 111)
@@ -101,7 +101,7 @@
# Building a shared library:
#
# myDLL.DLL.OBJECTS = foo.o bar.o
-# myDLL.LDFLAGS = -L/a/lib/path -lmylib
+# myDLL.DLL.LDFLAGS = -L/a/lib/path -lmylib
# $(call ShakeNMake.CALL.RULES.DLLS,myDLL)
#
# Like CALL.RULES.BINS, you may pass an arbitrary number of DLL names to
@@ -196,16 +196,16 @@
ifneq (,$(COMSPEC))
$(warning Setting ShakeNMake.SMELLS.LIKE.WINDOWS to 1)
ShakeNMake.SMELLS.LIKE.WINDOWS := 1
-ShakeNMake.EXTENSIONS.DLL = .DLL# maintenance reminder: this must stay upper-case!
-ShakeNMake.EXTENSIONS.EXE = .EXE# maintenance reminder: this must stay upper-case!
+ShakeNMake.EXTENSIONS.DLL := .DLL# maintenance reminder: this must stay upper-case!
+ShakeNMake.EXTENSIONS.EXE := .EXE# maintenance reminder: this must stay upper-case!
else
ShakeNMake.SMELLS.LIKE.WINDOWS := 0
-ShakeNMake.EXTENSIONS.DLL = .so
-ShakeNMake.EXTENSIONS.EXE =# no whitespace, please
+ShakeNMake.EXTENSIONS.DLL := .so
+ShakeNMake.EXTENSIONS.EXE :=# no whitespace, please
endif
-ShakeNMake.MAKEFILE = shake-n-make.make
+ShakeNMake.MAKEFILE := shake-n-make.make
$(ShakeNMake.MAKEFILE):# avoid breaking some deps checks if someone renames this file (been there, done that)
########################################################################
@@ -224,7 +224,7 @@
# auto-add the makefiles to DIST_FILES, filtering out any which start
# with a dot because we use such files for temp/volitile files which
# contain Make rules (C/C++ deps, for example).
-PACKAGE.MAKEFILE = $(firstword $(MAKEFILE_LIST))# normally either Makefile or GNUmakefile
+PACKAGE.MAKEFILE := $(firstword $(MAKEFILE_LIST))# normally either Makefile or GNUmakefile
PACKAGE.DIST_FILES += $(filter-out .%,$(MAKEFILE_LIST))
@@ -327,8 +327,10 @@
ShakeNMake.CALL.UNINSTALL = { \
test -d $(1) || exit 0; \
for x in $(2); do \
- echo -e "\t<-- " $(1)/$$x; \
- rm -f $(1)/$$x || exit; \
+ f=$(1)/$$x; \
+ echo -e "\t<-- " $$f; \
+ if [ -d $$f ]; then rm -r $$f; else \
+ rm -f $$f || exit; fi; \
done; \
}; \
rmdir $(1) 2>/dev/null || true;
@@ -482,7 +484,7 @@
# Also defines the var $(1).DLL, which expands to the filename of the DLL,
# (normally $(1)$(ShakeNMake.EXTENSIONS.DLL)).
define ShakeNMake.EVAL.RULES.DLL
-$(1).DLL = $(1)$(ShakeNMake.EXTENSIONS.DLL)
+$(1).DLL ?= $(1)$(ShakeNMake.EXTENSIONS.DLL)
ifneq (.DLL,$(ShakeNMake.EXTENSIONS.DLL))
$(1).DLL: $$($(1).DLL)
endif
@@ -607,7 +609,7 @@
##################################################
PACKAGE.DIST_FILES += $(ShakeNMake.DOXYGEN.DOXYFILE_TEMPLATE) $(ShakeNMake.DOXYGEN.INDEX)
-ShakeNMake.DOXYGEN.INCLUDE_DIRS = .
+ShakeNMake.DOXYGEN.INCLUDE_DIRS += .
ShakeNMake.DOXYGEN.OUTPUT_DIR = $(PACKAGE.NAME)-$(PACKAGE.VERSION)-doxygen
@@ -642,8 +644,8 @@
CLEAN_FILES += Doxyfile $(ShakeNMake.DOXYGEN.OUTPUT_DIR) latex
-INSTALL_DOXYGEN = $(ShakeNMake.DOXYGEN.OUTPUT_DIR)
-INSTALL_DOXYGEN_DEST = $(prefix)/share/doc/$(PACKAGE.NAME)
+INSTALL.DOXYGEN := $(ShakeNMake.DOXYGEN.OUTPUT_DIR)
+INSTALL.DOXYGEN.DEST ?= $(prefix)/share/doc/$(PACKAGE.NAME)
install: doxygen
$(call ShakeNMake.CALL.RULES.INSTALL,DOXYGEN)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2008-01-04 18:47:24
|
Revision: 110
http://toc.svn.sourceforge.net/toc/?rev=110&view=rev
Author: sgbeal
Date: 2008-01-04 10:47:20 -0800 (Fri, 04 Jan 2008)
Log Message:
-----------
typo corrections
Modified Paths:
--------------
make-book/trunk/code/ShakeNMake/shake-n-make.make
Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-11-10 04:29:42 UTC (rev 109)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make 2008-01-04 18:47:20 UTC (rev 110)
@@ -11,7 +11,7 @@
# in higher-level makefiles and include this one from there.
#
# The shell code in this makefile assumes GNU Make, GNU Bash and GNU
-# versions several other common system tools, like mkdir, tar, sed,
+# versions of several other common system tools, like mkdir, tar, sed,
# etc.
#
########################################################################
@@ -49,7 +49,8 @@
# include shake-n-make.mk
#
# Using spaces or special shell characters in .NAME and .VERSION may
-# cause problems in this code.
+# cause problems in this code. Likewise, special characters in
+# filenames may cause problems with some of the built-in rules.
#
# PACKAGE.* are used when building a distribution tarball.
#
@@ -162,7 +163,7 @@
#
# Note that GNUmakefile and shake-n-make.make are added to DIST_FILES by
# default, so you don't need to add those. If shake-n-make.make is using
-# mkdep.c to generate C/C++ dependencies than that file is also
+# mkdep.c to generate C/C++ dependencies then that file is also
# automatically included in the distribution.
#
# If you want to use a non-GNU tar or change the compression type
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-11-10 04:29:38
|
Revision: 109
http://toc.svn.sourceforge.net/toc/?rev=109&view=rev
Author: sgbeal
Date: 2007-11-09 20:29:42 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
added visual queue when Doxyfile is (re)created
Modified Paths:
--------------
make-book/trunk/code/ShakeNMake/shake-n-make.make
Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-11-10 04:06:52 UTC (rev 108)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-11-10 04:29:42 UTC (rev 109)
@@ -618,6 +618,7 @@
-e 's,@PERL@,$(ShakeNMake.BINS.PERL),' \
-e 's,@USE_DOT@,$(ShakeNMake.DOXYGEN.USE_DOT),' \
< $(ShakeNMake.DOXYGEN.DOXYFILE_TEMPLATE) > $@
+ @echo "Created $@"
doxygen-clean:
@test -d $(ShakeNMake.DOXYGEN.OUTPUT_DIR) && rm -fr $(ShakeNMake.DOXYGEN.OUTPUT_DIR); \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-11-10 04:06:48
|
Revision: 108
http://toc.svn.sourceforge.net/toc/?rev=108&view=rev
Author: sgbeal
Date: 2007-11-09 20:06:52 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
corrected missing PACKAGE.CLEAN_FILES from the cleanup rules.
Modified Paths:
--------------
make-book/trunk/code/ShakeNMake/shake-n-make.make
Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-11-08 22:30:45 UTC (rev 107)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-11-10 04:06:52 UTC (rev 108)
@@ -527,12 +527,12 @@
CLEAN_FILES += *.o
DISTCLEAN_FILES += *~
clean: ShakeNMake.FORCE
- @fl="$(sort $(wildcard $(CLEAN_FILES)))"; \
+ @fl="$(sort $(wildcard $(CLEAN_FILES) $(PACKAGE.CLEAN_FILES)))"; \
test x = "x$$fl" && { echo "Nothing to clean!"; exit 0; }; \
$(call ShakeNMake.CALL.SETX,"Cleaning up ..."); \
$(ShakeNMake.BINS.RM) -fr $$fl
distclean: ShakeNMake.FORCE
- @fl="$(sort $(wildcard $(CLEAN_FILES) $(DISTCLEAN_FILES)))"; \
+ @fl="$(sort $(wildcard $(CLEAN_FILES) $(DISTCLEAN_FILES) $(PACKAGE.CLEAN_FILES) $(PACKAGE.DISTCLEAN_FILES)))"; \
test x = "x$$fl" && { echo "Nothing to clean!"; exit 0; }; \
$(call ShakeNMake.CALL.SETX,"Cleaning up ..."); \
$(ShakeNMake.BINS.RM) -fr $$fl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-11-08 22:30:43
|
Revision: 107
http://toc.svn.sourceforge.net/toc/?rev=107&view=rev
Author: sgbeal
Date: 2007-11-08 14:30:45 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
fixed exit code when make dist failed
Modified Paths:
--------------
make-book/trunk/code/ShakeNMake/shake-n-make.make
Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-10-28 06:47:32 UTC (rev 106)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-11-08 22:30:45 UTC (rev 107)
@@ -298,7 +298,7 @@
endif
dist:
@$(MAKE) --no-print-directory dist-target-implementation; err=$$?; \
- $(MAKE) --no-print-directory dist-cleanup; echo $$err
+ $(MAKE) --no-print-directory dist-cleanup; exit $$err
clean: dist-cleanup
endif # if $(ShakeNMake.BINS.TAR)
# end dist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-10-28 06:47:27
|
Revision: 106
http://toc.svn.sourceforge.net/toc/?rev=106&view=rev
Author: sgbeal
Date: 2007-10-27 23:47:32 -0700 (Sat, 27 Oct 2007)
Log Message:
-----------
corrected args ordering for .DLL targets to avoid undefined symbols
Modified Paths:
--------------
make-book/trunk/code/ShakeNMake/shake-n-make.make
Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-10-28 03:41:29 UTC (rev 105)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-10-28 06:47:32 UTC (rev 106)
@@ -411,6 +411,12 @@
$(INCLUDES) $($(*).OBJ.INCLUDES) \
$(CPPFLAGS) $($(*).OBJ.CPPFLAGS) \
-c -o $@ $<
+%.o: %.cxx
+ @$(call ShakeNMake.CALL.SETX,"CXX [$@] ..."); \
+ $(CXX) $(CXXFLAGS) $($(*).OBJ.CXXFLAGS) \
+ $(INCLUDES) $($(*).OBJ.INCLUDES) \
+ $(CPPFLAGS) $($(*).OBJ.CPPFLAGS) \
+ -c -o $@ $<
# end %.o: %.cpp rules
########################################################################
@@ -484,8 +490,9 @@
@test x = "x$$($(1).DLL.OBJECTS)$$($(1).DLL.SOURCES)" && { \
echo "$(1).DLL.OBJECTS and/or $(1).DLL.SOURCES are/is undefined!"; exit 1; }; \
$(call ShakeNMake.CALL.SETX,"CXX [$$@] ..."); \
- $$(CXX) -o $$@ -shared -export-dynamic $$(LDFLAGS) \
- $$($(1).DLL.LDFLAGS) $$($(1).DLL.OBJECTS) $$($(1).DLL.SOURCES) \
+ $$(CXX) -o $$@ -shared $$(LDFLAGS) \
+ $$($(1).DLL.OBJECTS) $$($(1).DLL.SOURCES) \
+ $$($(1).DLL.LDFLAGS) \
$$($(1).DLL.CPPFLAGS)
endef
########################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-10-28 03:41:26
|
Revision: 105
http://toc.svn.sourceforge.net/toc/?rev=105&view=rev
Author: sgbeal
Date: 2007-10-27 20:41:29 -0700 (Sat, 27 Oct 2007)
Log Message:
-----------
re-ordered flags for .BIN rules to fix link with static libs
Modified Paths:
--------------
make-book/trunk/code/ShakeNMake/shake-n-make.make
Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-10-21 01:22:05 UTC (rev 104)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-10-28 03:41:29 UTC (rev 105)
@@ -450,8 +450,8 @@
$$(CFLAGS) $$($(1).BIN.CFLAGS) \
$$(CXXFLAGS) $$($(1).BIN.CXXFLAGS) \
$$(CPPFLAGS) $$($(1).BIN.CPPFLAGS) \
- $$(LDFLAGS) $$($(1).BIN.LDFLAGS) \
- $$($(1).BIN.OBJECTS) $$($(1).BIN.SOURCES)
+ $$($(1).BIN.OBJECTS) $$($(1).BIN.SOURCES) \
+ $$(LDFLAGS) $$($(1).BIN.LDFLAGS)
# note about 'set -x': i do this because it normalizes backslashed
# newline, extra spaces, and other oddities of formatting.
endef
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-10-21 01:22:01
|
Revision: 104
http://toc.svn.sourceforge.net/toc/?rev=104&view=rev
Author: sgbeal
Date: 2007-10-20 18:22:05 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
added cxx as alias for cpp
Modified Paths:
--------------
trunk/toc2/make/toc2-c.make
Modified: trunk/toc2/make/toc2-c.make
===================================================================
--- trunk/toc2/make/toc2-c.make 2007-10-21 01:13:14 UTC (rev 103)
+++ trunk/toc2/make/toc2-c.make 2007-10-21 01:22:05 UTC (rev 104)
@@ -78,6 +78,9 @@
# Uses toc2.call.compile-o-c++ to compile $@ from $<.
%.o: %.cpp $(toc2.bins.mkdep) $(toc2.makefile.c)
@$(call toc2.call.compile-o-c++,$@,$<)
+%.o: %.cxx $(toc2.bins.mkdep) $(toc2.makefile.c)
+ @$(call toc2.call.compile-o-c++,$@,$<)
+
########################################################################
# Uses toc2.call.compile-o-c++ to compile $@ from $<.
%.o: %.c++ $(toc2.bins.mkdep) $(toc2.makefile.c)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-10-21 01:13:10
|
Revision: 103
http://toc.svn.sourceforge.net/toc/?rev=103&view=rev
Author: sgbeal
Date: 2007-10-20 18:13:14 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
egg
Added Paths:
-----------
trunk/examples/swig/
trunk/examples/swig/GNUmakefile
trunk/examples/swig/SomeModule.c
trunk/examples/swig/SomeModule.h
trunk/examples/swig/SomeModule.i
trunk/examples/swig/dl_local.inc.php
trunk/examples/swig/test.php
trunk/examples/swig/toc2.make
Added: trunk/examples/swig/GNUmakefile
===================================================================
--- trunk/examples/swig/GNUmakefile (rev 0)
+++ trunk/examples/swig/GNUmakefile 2007-10-21 01:13:14 UTC (rev 103)
@@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+# Demonstration of using the toc2 doxygen helper...
+include toc2.make
+
+
+SWIG-PHP5-CPP.RULES_GENERATOR := $(toc2.dirs.makefiles)/makerules.swig-php5-cpp
+SWIG-PHP5-CPP.DEPSFILE := .toc2.swig-php5-cpp.d
+$(SWIG-PHP5-CPP.DEPSFILE): $(SWIG-PHP5-CPP.RULES_GENERATOR) $(toc2.files.makefile)
+ $(call toc2.call.generate-rules,swig-php5-cpp,SomeModule) > $@
+SomeModule.SWIG.PHP5-CPP.OBJECTS += SomeModule.o
+-include $(SWIG-PHP5-CPP.DEPSFILE)
+
+
+SWIG-PYTHON-CPP.RULES_GENERATOR := $(toc2.dirs.makefiles)/makerules.swig-python-cpp
+SWIG-PYTHON-CPP.DEPSFILE := .toc2.swig-python-cpp.d
+$(SWIG-PYTHON-CPP.DEPSFILE): $(SWIG-PYTHON-CPP.RULES_GENERATOR) $(toc2.files.makefile)
+ $(call toc2.call.generate-rules,swig-python-cpp,SomeModule) > $@
+SomeModule.SWIG.PYTHON-CPP.OBJECTS += SomeModule.o
+-include $(SWIG-PYTHON-CPP.DEPSFILE)
+
+
+all: swig-modules
+
+#include toc2-swig.make
+#$(call toc2.call.define-swig-module,SomeModule)
+#toc2.swig.SomeModule.args += -php5 -c++
+#package.clean_files += SomeModule.php php_SomeModule.h
+
+#$(toc2.swig.SomeModule_wrap.o): CPPFLAGS:=$(shell php-config5 --includes)
+#SomeModule.DLL.OBJECTS := SomeModule.o $(toc2.swig.SomeModule_wrap.o)
+#include $(toc2.dirs.makefiles)/toc2-c.make
+#$(call toc2.call.rules.c-dll,SomeModule)
+#all: swig-modules SomeModule.DLL
+
Added: trunk/examples/swig/SomeModule.c
===================================================================
--- trunk/examples/swig/SomeModule.c (rev 0)
+++ trunk/examples/swig/SomeModule.c 2007-10-21 01:13:14 UTC (rev 103)
@@ -0,0 +1,19 @@
+#include "SomeModule.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int smod_func1( int a, int b )
+{
+ return a + b;
+}
+
+double smod_func2( double a, double b )
+{
+ return a + b;
+}
+
+#ifdef __cplusplus
+}
+#endif
Added: trunk/examples/swig/SomeModule.h
===================================================================
--- trunk/examples/swig/SomeModule.h (rev 0)
+++ trunk/examples/swig/SomeModule.h 2007-10-21 01:13:14 UTC (rev 103)
@@ -0,0 +1,13 @@
+#ifndef SOME_MODULE_H
+#define SOME_MODULE_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+int smod_func1( int, int );
+double smod_func2( double, double );
+#ifdef __cplusplus
+}
+#endif
+
+#endif // SOME_MODULE_H
Added: trunk/examples/swig/SomeModule.i
===================================================================
--- trunk/examples/swig/SomeModule.i (rev 0)
+++ trunk/examples/swig/SomeModule.i 2007-10-21 01:13:14 UTC (rev 103)
@@ -0,0 +1,6 @@
+
+%{
+#include "SomeModule.h"
+%}
+
+%include "SomeModule.h"
Added: trunk/examples/swig/dl_local.inc.php
===================================================================
--- trunk/examples/swig/dl_local.inc.php (rev 0)
+++ trunk/examples/swig/dl_local.inc.php 2007-10-21 01:13:14 UTC (rev 103)
@@ -0,0 +1,75 @@
+<?php
+/*
+ Function: dl_local()
+ Reference: http://us2.php.net/manual/en/function.dl.php
+ Author: Brendon Crawford <endofyourself |AT| yahoo>
+ Usage: dl_local( "mylib.so" );
+ Returns: Extension Name (NOT the extension filename however)
+ NOTE:
+ This function can be used when you need to load a PHP extension (module,shared object,etc..),
+ but you do not have sufficient privelages to place the extension in the proper directory where it can be loaded. This function
+ will load the extension from the CURRENT WORKING DIRECTORY only.
+ If you need to see which functions are available within a certain extension,
+ use "get_extension_funcs()". Documentation for this can be found at
+ "http://us2.php.net/manual/en/function.get-extension-funcs.php".
+*/
+
+function dl_local( $extensionFile ) {
+ //make sure that we are ABLE to load libraries
+ if( !(bool)ini_get( "enable_dl" ) || (bool)ini_get( "safe_mode" ) ) {
+ throw new Exception("dh_local(): Loading extensions is not permitted." );
+ }
+
+ //check to make sure the file exists
+ if( !file_exists( $extensionFile ) ) {
+ throw new Exception( "dl_local(): File '$extensionFile' does not exist." );
+ }
+
+ //check the file permissions
+ if( !is_executable( $extensionFile ) ) {
+ throw new Exception( "dl_local(): File '$extensionFile' is not executable." );
+ }
+
+ //we figure out the path
+ $currentDir = getcwd() . "/";
+ $currentExtPath = ini_get( "extension_dir" );
+ $subDirs = preg_match_all( "/\//" , $currentExtPath , $matches );
+ unset( $matches );
+
+ //lets make sure we extracted a valid extension path
+ if( !(bool)$subDirs ) {
+ throw new Exception( "dl_local(): Could not determine a valid extension path [extension_dir]." );
+ }
+
+ $extPathLastChar = strlen( $currentExtPath ) - 1;
+
+ if( $extPathLastChar == strrpos( $currentExtPath , "/" ) ) {
+ $subDirs--;
+ }
+
+ $backDirStr = "";
+ for( $i = 1; $i <= $subDirs; $i++ ) {
+ $backDirStr .= "..";
+ if( $i != $subDirs ) {
+ $backDirStr .= "/";
+ }
+ }
+
+ //construct the final path to load
+ $finalExtPath = $backDirStr . $currentDir . $extensionFile;
+
+ //now we execute dl() to actually load the module
+ if( !dl( $finalExtPath ) ) {
+ throw new Exception("dl({$finalExtPath}) failed");
+ }
+
+ //if the module was loaded correctly, we must bow grab the module name
+ $loadedExtensions = get_loaded_extensions();
+ $thisExtName = $loadedExtensions[ sizeof( $loadedExtensions ) - 1 ];
+
+ //lastly, we return the extension name
+ return $thisExtName;
+
+}//end dl_local()
+
+?>
Added: trunk/examples/swig/test.php
===================================================================
--- trunk/examples/swig/test.php (rev 0)
+++ trunk/examples/swig/test.php 2007-10-21 01:13:14 UTC (rev 103)
@@ -0,0 +1,12 @@
+<?php
+
+require("dl_local.inc.php");
+assert( dl_local("SomeModule.so") );
+require("SomeModule.php");
+
+echo smod_func1(1,2)."\n";
+echo smod_func2(1,2)."\n";
+
+echo "Bye!\n";
+exit(0);
+?>
Added: trunk/examples/swig/toc2.make
===================================================================
--- trunk/examples/swig/toc2.make (rev 0)
+++ trunk/examples/swig/toc2.make 2007-10-21 01:13:14 UTC (rev 103)
@@ -0,0 +1,149 @@
+#!/do/not/make
+########################################################################
+# toc2.make.at: template makefile for toc2.make, a core concept of the
+# toc2 build process. This is filtered at the end of the configure
+# process. toc2.make must be included by your Makefiles, like so:
+#
+# include toc2.make
+#
+# Each makefile which does that will get a toc2.make created during
+# the configure process. Each toc2.make is specific to that sub-dir
+# (more specifically, each subdir at the same depth gets the same
+# toc2.make).
+#
+# All of the "at-vars" in this file are expected to come in
+# via the configure process, either from core tests or from
+# the core itself.
+#
+# Ideally this file should be free of project-specific code:
+# put that in $(toc2.top_srcdir)/toc2.$(package.name).make.at and
+# in then $(toc2.top_srcdir)/configure.$(package.name) run:
+# toc_test_require toc2_project_makefile
+########################################################################
+default: all
+all:
+FORCE: ; @true
+
+########################################################################
+# $(package.name) and $(package.version) are the penultimate
+# variables, holding the package name and version. They must not
+# contain spaces, and some characters may confuse other tools. Most
+# notable, a '+' in the name is likely to break the makedist tool.
+package.version = 20071020
+package.name = toc2
+
+########################################################################
+# $(SHELL) must be BASH, but the path might be system-specific.
+SHELL = /bin/bash
+##### prefix and DESTDIR are for autotools 'make install' compatibility
+prefix ?= /usr/local
+DESTDIR ?=
+
+ifneq (,$(COMSPEC))
+$(warning Smells like Windows!)
+toc2.flags.smells_like_windows := 1
+toc2.platform.file_extensions.dll = .DLL# maintenance reminder: this must stay upper-case!
+toc2.platform.file_extensions.lib = .a# yes, use .a for cygwin
+toc2.platform.file_extensions.exe = .EXE# maintenance reminder: this must stay upper-case!
+else
+toc2.flags.smells_like_windows := 0
+toc2.platform.file_extensions.dll = .so
+toc2.platform.file_extensions.lib = .a
+toc2.platform.file_extensions.exe =# no whitespace, please
+endif
+
+toc2.files.makefile := $(word 1,$(MAKEFILE_LIST))# accommodate Makefile/GNUmakefile
+$(toc2.files.makefile):
+
+########################################################################
+# $(toc2.flags.quiet) is used by some toc2 code to enable/disable
+# verbose output. Set it to 1 to enable it, or any other value to
+# disable it.
+toc2.flags.quiet ?= $(if @TOC2_BUILD_QUIETLY@,@TOC2_BUILD_QUIETLY@,0)
+
+toc2.top_srcdir = ../..
+
+##### include configure-created code:
+toc2.makefile.config_vars = $(toc2.top_srcdir)/toc2.$(package.name).configure.make
+$(toc2.makefile.config_vars):# created by configure process
+include $(toc2.makefile.config_vars)
+
+
+toc2.project_makefile = $(wildcard $(toc2.top_srcdir)/toc2.$(package.name).make)
+toc2.project_makefile_at = $(wildcard $(toc2.top_srcdir)/toc2.$(package.name).make.at)
+
+toc2.home ?= /home/stephan/cvs/toc2/toc2
+# todo: check if this is under $(toc2.top_srcdir), so we can make this path relative.
+
+toc2.dirs.makefiles = $(toc2.home)/make
+toc2.dirs.bin = $(toc2.home)/bin
+toc2.dirs.sbin = $(toc2.home)/sbin
+toc2.dirs.relative_to_top = examples/swig
+# e.g., in lib/foo, toc2.dirs.relative_to_top == lib/foo
+
+toc2.make = toc2.make
+# deprecated TOP_toc2.make = $(toc2.top_srcdir)/$(toc2.make)
+
+##### some core utilities:
+toc2.bins.awk = /usr/bin/awk
+toc2.bins.perl = /usr/bin/perl
+toc2.bins.sed = /bin/sed
+toc2.bins.tar = /bin/tar
+toc2.bins.gzip = /bin/gzip
+toc2.bins.bzip = /bin/bzip2
+toc2.bins.zip = /usr/bin/zip
+toc2.bins.ar = $(AR)
+toc2.bins.installer = /home/stephan/cvs/toc2/toc2/bin/install-sh
+toc2.bins.makedist = /home/stephan/cvs/toc2/toc2/bin/makedist
+
+
+# The emoticons are now exported directly by toc2_core.sh to toc2.PACKAGE.configure.make:
+# toc2.emoticons.okay=[1m:-)[m
+# toc2.emoticons.warning=[1m:-O[m
+# toc2.emoticons.error=[1m:-([m
+# toc2.emoticons.grief=@TOC2_EMOTICON_GRIEF@
+# toc2.emoticons.wtf=@TOC2_EMOTICON_WTF@
+
+toc2.clean_files += $(wildcard .toc2.* core *~)
+toc2.distclean_files += $(toc2.make)
+
+ifeq (.,$(toc2.top_srcdir))
+ toc2.distclean_files += \
+ toc2.$(package.name).make \
+ toc2.$(package.name).configure.make
+endif
+
+
+include $(toc2.dirs.makefiles)/toc2-functions-core.make
+include $(toc2.dirs.makefiles)/toc2-subdirs.make
+include $(toc2.dirs.makefiles)/toc2-cleanup.make
+include $(toc2.dirs.makefiles)/toc2-install.make
+include $(toc2.dirs.makefiles)/toc2-dist.make
+
+########################################################################
+# A kludge to get mkdep-toc2 deleted at a proper time... only if we're
+# in the top-most dir and mkdep-toc2 exists...
+# This code *should* be in toc2-c.make, but that file is not globally
+# included.
+toc2.bins.mkdep.c := $(wildcard $(toc2.home)/bin/mkdep-toc2.c)
+toc2.bins.mkdep := $(if $(toc2.bins.mkdep.c),$(toc2.top_srcdir)/$(basename $(notdir $(toc2.bins.mkdep.c))),)
+########################################################################
+# Set toc2.bins.mkdep.flags to whatever -I flags you want to use for
+# $(toc2.bins.mkdep). Any non-I flags are ignored by mkdep.
+toc2.bins.mkdep.flags += $(INCLUDES) $(CPPFLAGS)
+ifeq (.,$(toc2.top_srcdir))
+ .PHONY: distclean-mkdep-toc2
+ distclean-mkdep-toc2:
+ @test "x." = "x$(toc2.top_srcdir)" -a \
+ x != 'x$(toc2.bins.mkdep)' -a \
+ -e "$(toc2.bins.mkdep)" || exit 0; \
+ rm -f "$(toc2.bins.mkdep)"
+ distclean-.: distclean-mkdep-toc2
+endif
+
+########################################################################
+# finally, load the project-specific code:
+ifneq (,$(toc2.project_makefile))
+ include $(toc2.project_makefile)
+endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-10-21 01:11:35
|
Revision: 102
http://toc.svn.sourceforge.net/toc/?rev=102&view=rev
Author: sgbeal
Date: 2007-10-20 18:11:39 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
egg
Added Paths:
-----------
trunk/toc2/make/makerules.swig-php5-cpp
trunk/toc2/make/makerules.swig-python-cpp
Added: trunk/toc2/make/makerules.swig-php5-cpp
===================================================================
--- trunk/toc2/make/makerules.swig-php5-cpp (rev 0)
+++ trunk/toc2/make/makerules.swig-php5-cpp 2007-10-21 01:11:39 UTC (rev 102)
@@ -0,0 +1,72 @@
+#!/bin/sh
+# creates some makefile code for SWIG PHP5 modules.
+
+test -z "$1" && {
+ echo "usage: $0 module1 [module2 ... moduleN]"
+ exit 1
+}
+cat <<EOF
+########################################################################
+# Auto-generated by $0
+# $(date)
+$0:
+
+ifeq (,\$(toc2.bins.swig))
+ toc2.bins.swig := \$(call toc2.call.find-program,swig)
+ \$(if \$(toc2.bins.swig),,\$(error 'swig' not found in PATH))
+endif
+
+ifeq (,\$(toc2.bins.php-config5))
+ toc2.bins.php-config5 := \$(call toc2.call.find-program,php-config5)
+ \$(if \$(toc2.bins.php-config5),,\$(error It seems that php-config5 was not found!))
+endif
+toc2.bins.php5-config.includes := \$(shell \$(toc2.bins.php-config5) --includes)
+
+ifeq (,\$(toc2.makefile.c))
+ include \$(toc2.dirs.makefiles)/toc2-c.make
+endif
+
+swig-modules:
+EOF
+
+for t in $@; do
+ cat <<EOF
+########################################################################
+# Start auto-generated rules for SWIG PHP5 module ${t}...
+
+${t}.SWIG.PHP5-CPP.INTERFACE := ${t}.i
+${t}.SWIG.PHP5-CPP.FLAGS := -php5 -c++ -module ${t}
+${t}.SWIG.PHP5-CPP.WRAP.cpp := ${t}_wrap.cpp
+${t}.SWIG.PHP5-CPP.WRAP.o := ${t}_wrap.o
+${t}.SWIG.PHP5-CPP.OBJECTS += \$(${t}.SWIG.PHP5-CPP.WRAP.o)
+${t}.SWIG.PHP5-CPP.WRAP.h := php_${t}.h
+${t}.SWIG.PHP5-CPP.WRAP.php := ${t}.php
+
+\$(${t}.SWIG.PHP5-CPP.WRAP.o): CPPFLAGS:=\$(toc2.bins.php5-config.includes)
+
+
+\$(${t}.SWIG.PHP5-CPP.WRAP.cpp): \$(${t}.SWIG.PHP5-CPP.INTERFACE) $0 \$(toc2.files.makefile)
+ifeq (0,\$(toc2.flags.making_clean))
+ \$(toc2.bins.swig) \$(${t}.SWIG.PHP5-CPP.FLAGS) \$(${t}.SWIG.PHP5-CPP.INTERFACE)
+else
+ @echo "clean: skipping generation of SWIG module '${t}'."
+endif
+# ^^^^ toc2.flags.making_clean
+
+
+${t}.DLL.OBJECTS += \$(${t}.SWIG.PHP5-CPP.OBJECTS)
+\$(call toc2.call.rules.c-dll,${t})
+
+swig-modules: \$(${t}.DLL)
+
+
+${t}.SWIG.PHP5-CPP.clean_files := \$(${t}.SWIG.PHP5-CPP.WRAP.cpp) \
+ \$(${t}.SWIG.PHP5-CPP.WRAP.o) \
+ \$(${t}.SWIG.PHP5-CPP.WRAP.h) \
+ \$(${t}.SWIG.PHP5-CPP.WRAP.php)
+
+\$(call toc2.call.define-cleanup-set,${t}.SWIG.PHP5-CPP)
+# end auto-generated rules for SWIG PHP5 module ${t}
+########################################################################
+EOF
+done
Property changes on: trunk/toc2/make/makerules.swig-php5-cpp
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/toc2/make/makerules.swig-python-cpp
===================================================================
--- trunk/toc2/make/makerules.swig-python-cpp (rev 0)
+++ trunk/toc2/make/makerules.swig-python-cpp 2007-10-21 01:11:39 UTC (rev 102)
@@ -0,0 +1,70 @@
+#!/bin/sh
+# creates some makefile code for SWIG PYTHON modules.
+
+test -z "$1" && {
+ echo "usage: $0 module1 [module2 ... moduleN]"
+ exit 1
+}
+cat <<EOF
+########################################################################
+# Auto-generated by $0
+# $(date)
+$0:
+
+ifeq (,\$(toc2.bins.swig))
+ toc2.bins.swig := \$(call toc2.call.find-program,swig)
+ \$(if \$(toc2.bins.swig),,\$(error 'swig' not found in PATH))
+endif
+
+ifeq (,\$(toc2.bins.python-config))
+ toc2.bins.python-config := \$(call toc2.call.find-program,python-config)
+ \$(if \$(toc2.bins.python-config),,\$(error It seems that python-config was not found!))
+endif
+toc2.bins.python-config.includes := \$(shell \$(toc2.bins.python-config) --includes)
+
+ifeq (,\$(toc2.makefile.c))
+ include \$(toc2.dirs.makefiles)/toc2-c.make
+endif
+
+swig-modules:
+EOF
+
+for t in $@; do
+ pyt=_${t}
+ cat <<EOF
+########################################################################
+# Start auto-generated rules for SWIG PYTHON module ${t}...
+
+${t}.SWIG.PYTHON-CPP.INTERFACE := ${t}.i
+${t}.SWIG.PYTHON-CPP.WRAP.cxx := ${pyt}_wrap.cxx
+${t}.SWIG.PYTHON-CPP.FLAGS := -python -c++ -module ${t} -o \$(${t}.SWIG.PYTHON-CPP.WRAP.cxx)
+${t}.SWIG.PYTHON-CPP.WRAP.o := ${pyt}_wrap.o
+${t}.SWIG.PYTHON-CPP.OBJECTS += \$(${t}.SWIG.PYTHON-CPP.WRAP.o)
+${t}.SWIG.PYTHON-CPP.WRAP.py := ${t}.py
+
+\$(${t}.SWIG.PYTHON-CPP.WRAP.o): CPPFLAGS:=\$(toc2.bins.python-config.includes)
+
+\$(${t}.SWIG.PYTHON-CPP.WRAP.cxx): \$(${t}.SWIG.PYTHON-CPP.INTERFACE) $0 \$(toc2.files.makefile)
+ifeq (0,\$(toc2.flags.making_clean))
+ \$(toc2.bins.swig) \$(${t}.SWIG.PYTHON-CPP.FLAGS) \$(${t}.SWIG.PYTHON-CPP.INTERFACE)
+else
+ @echo "clean: skipping generation of SWIG PYTHON module '${t}'."
+endif
+# ^^^^ toc2.flags.making_clean
+
+
+${pyt}.DLL.OBJECTS += \$(${t}.SWIG.PYTHON-CPP.OBJECTS)
+\$(call toc2.call.rules.c-dll,${pyt})
+
+swig-modules: \$(${pyt}.DLL)
+
+
+${t}.SWIG.PYTHON-CPP.clean_files := \$(${t}.SWIG.PYTHON-CPP.WRAP.cxx) \
+ \$(${t}.SWIG.PYTHON-CPP.WRAP.o) \
+ \$(${t}.SWIG.PYTHON-CPP.WRAP.py)
+
+\$(call toc2.call.define-cleanup-set,${t}.SWIG.PYTHON-CPP)
+# end auto-generated rules for SWIG PYTHON module ${t}
+########################################################################
+EOF
+done
Property changes on: trunk/toc2/make/makerules.swig-python-cpp
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-10-20 23:22:16
|
Revision: 101
http://toc.svn.sourceforge.net/toc/?rev=101&view=rev
Author: sgbeal
Date: 2007-10-20 16:22:20 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
corrected a typo
Modified Paths:
--------------
trunk/toc2/make/c-bins.make
Modified: trunk/toc2/make/c-bins.make
===================================================================
--- trunk/toc2/make/c-bins.make 2007-10-20 19:41:54 UTC (rev 100)
+++ trunk/toc2/make/c-bins.make 2007-10-20 23:22:20 UTC (rev 101)
@@ -44,11 +44,11 @@
c-bins.RULES_GENERATOR = $(toc2.dirs.makefiles)/makerules.c-bins
-c-bins.COMMON_DEPS += $(toc.2.files.makefile) $(c-bins.makefile) $(c-bins.objects)
+c-bins.COMMON_DEPS += $(toc2.files.makefile) $(c-bins.makefile) $(c-bins.objects)
ifeq (1,$(toc2.flags.making_clean))
$(c-bins.DEPSFILE): ; @true
else
-$(c-bins.DEPSFILE): $(toc.2.files.makefile) $(c-bins.RULES_GENERATOR) $(c-bins.makefile)
+$(c-bins.DEPSFILE): $(toc2.files.makefile) $(c-bins.RULES_GENERATOR) $(c-bins.makefile)
@echo "Generating c-bins rules: $(c-bins.list)"; \
$(call toc2.call.generate-rules,c-bins,$(c-bins.list)) > $@
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-10-20 19:41:51
|
Revision: 100
http://toc.svn.sourceforge.net/toc/?rev=100&view=rev
Author: sgbeal
Date: 2007-10-20 12:41:54 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
typo correction
Modified Paths:
--------------
trunk/examples/filter/GNUmakefile
Modified: trunk/examples/filter/GNUmakefile
===================================================================
--- trunk/examples/filter/GNUmakefile 2007-10-20 19:40:39 UTC (rev 99)
+++ trunk/examples/filter/GNUmakefile 2007-10-20 19:41:54 UTC (rev 100)
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-# Demonstration of using the toc2 doxygen helper...
+# Demonstration of using the toc2 file filter helper...
include toc2.make
package.dist_files += $(wildcard *.in)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-10-20 19:40:35
|
Revision: 99
http://toc.svn.sourceforge.net/toc/?rev=99&view=rev
Author: sgbeal
Date: 2007-10-20 12:40:39 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
minor typo corrections in the docs
Modified Paths:
--------------
trunk/toc2/make/toc2-c.make
Modified: trunk/toc2/make/toc2-c.make
===================================================================
--- trunk/toc2/make/toc2-c.make 2007-08-05 08:21:28 UTC (rev 98)
+++ trunk/toc2/make/toc2-c.make 2007-10-20 19:40:39 UTC (rev 99)
@@ -75,11 +75,11 @@
$(COMPILE.cpp) $(INCLUDES) -o $(1) $(2)
endef
########################################################################
-# Uses toc3.call.compile-o-c++ to compile $@ from $<.
+# Uses toc2.call.compile-o-c++ to compile $@ from $<.
%.o: %.cpp $(toc2.bins.mkdep) $(toc2.makefile.c)
@$(call toc2.call.compile-o-c++,$@,$<)
########################################################################
-# Uses toc3.call.compile-o-c++ to compile $@ from $<.
+# Uses toc2.call.compile-o-c++ to compile $@ from $<.
%.o: %.c++ $(toc2.bins.mkdep) $(toc2.makefile.c)
@$(call toc2.call.compile-o-c++,$@,$<)
toc2.clean_files += *.d# i hate this wildcard here, but i don't see a way around it right now
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sg...@us...> - 2007-08-05 08:21:25
|
Revision: 98
http://toc.svn.sourceforge.net/toc/?rev=98&view=rev
Author: sgbeal
Date: 2007-08-05 01:21:28 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
fixed a really stupid var deref error
Modified Paths:
--------------
trunk/toc2/make/toc2-c.make
Modified: trunk/toc2/make/toc2-c.make
===================================================================
--- trunk/toc2/make/toc2-c.make 2007-07-05 12:09:41 UTC (rev 97)
+++ trunk/toc2/make/toc2-c.make 2007-08-05 08:21:28 UTC (rev 98)
@@ -2,7 +2,7 @@
########################################################################
# This file contains C/C++-related functions for the toc2 framework.
-toc2.makefile.c := $(word $(words MAKEFILE_LIST),$(MAKEFILE_LIST))
+toc2.makefile.c := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
$(toc2.makefile.c):
toc2.clean_files += *.o
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
