[PD-cvs] packages Makefile, 1.5, 1.6 Makefile.buildlayout, 1.2, 1.3 TODO, 1.2, 1.3
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Fri Nov 18 19:05:55 CET 2005
Update of /cvsroot/pure-data/packages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6392
Modified Files:
Makefile Makefile.buildlayout TODO
Log Message:
clean targets sorted and tested. There are now standard clean targets based on the destinations which are part of Makefile.buildlayout
Index: Makefile.buildlayout
===================================================================
RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.buildlayout 17 Nov 2005 00:06:46 -0000 1.2
--- Makefile.buildlayout 18 Nov 2005 18:05:53 -0000 1.3
***************
*** 1,5 ****
!
! ## Makefile.buildlayout
!
# This file should be exactly the same in each section of the CVS. A copy is
# kept in each section of the CVS so that each section will be self-contained.
--- 1,10 ----
! #==============================================================================#
! #
! # Centralized cross-platform build system Makefile.buildsystem
! #
! # this file contains all the common locations and targets
! # <hans at at.or.at>
! #
! #==============================================================================#
# This file should be exactly the same in each section of the CVS. A copy is
# kept in each section of the CVS so that each section will be self-contained.
***************
*** 26,29 ****
--- 31,67 ----
# <hans at at.or.at>
+ #==============================================================================#
+ #
+ ## PLATFORM-SPECIFIC SETTINGS
+ #
+ #==============================================================================#
+ # which OS to compile for
+ UNAME := $(shell uname -s)
+ ifeq ($(UNAME),Linux)
+ OS_NAME = linux
+ EXTENSION = pd_linux
+ else
+ ifeq ($(UNAME),Darwin)
+ OS_NAME = darwin
+ EXTENSION = pd_darwin
+ else
+ ifeq (MINGW,$(findstring MINGW,$(UNAME)))
+ OS_NAME = win
+ EXTENSION = dll
+ else
+ OS_NAME = unknown
+ EXTENSION = so
+ $(warning WARNING: unknown environment "$(UNAME)".)
+ endif
+ endif
+ endif
+
+
+ #==============================================================================#
+ #
+ # DIRECTORY STRUCTURE
+ #
+ #==============================================================================#
+
# sources
ABSTRACTIONS_SRC = $(SRC_ROOT_DIR)/abstractions
***************
*** 44,50 ****
MANUALS_DEST = $(DOCS_DEST)/manuals
! #------------------------------------------------------------------------------#
# DIRECTORY STRUCTURE TARGETS
! #------------------------------------------------------------------------------#
# first make sure that the directory structure is setup
$(INSTALL_PREFIX):
--- 82,92 ----
MANUALS_DEST = $(DOCS_DEST)/manuals
!
! #==============================================================================#
! #
# DIRECTORY STRUCTURE TARGETS
! #
! #==============================================================================#
!
# first make sure that the directory structure is setup
$(INSTALL_PREFIX):
***************
*** 66,67 ****
--- 108,185 ----
install -d $(OBJECTS_DEST)
+
+ #==============================================================================#
+ #
+ # CLEAN TARGETS
+ #
+ #==============================================================================#
+
+ applications_clean:
+ -rm -f -- $(APPLICATIONS_DEST)/*/*/*/*/*.*
+ -rm -f -- $(APPLICATIONS_DEST)/*/*/*/*.*
+ -rm -f -- $(APPLICATIONS_DEST)/*/*/*.*
+ -rm -f -- $(APPLICATIONS_DEST)/*/*.*
+ -rmdir $(APPLICATIONS_DEST)/*/*/*/*
+ -rmdir $(APPLICATIONS_DEST)/*/*/*
+ -rmdir $(APPLICATIONS_DEST)/*/*
+ -rmdir $(APPLICATIONS_DEST)/*
+ -rmdir $(APPLICATIONS_DEST)
+
+
+ help_clean:
+ -rm -f -- $(HELP_DEST)/*/*/*.*
+ -rm -f -- $(HELP_DEST)/*/*.*
+ -rm -f -- $(HELP_DEST)/*.*
+ -rmdir $(HELP_DEST)/*/*
+ -rmdir $(HELP_DEST)/*
+ -rmdir $(HELP_DEST)
+
+
+ manuals_clean:
+ -rm -f -- $(MANUALS_DEST)/*/*/*.*
+ -rm -f -- $(MANUALS_DEST)/*/*.*
+ -rmdir $(MANUALS_DEST)/*/*
+ -rmdir $(MANUALS_DEST)/*
+ -rmdir $(MANUALS_DEST)
+
+
+ objects_clean:
+ -rm $(OBJECTS_DEST)/*/*/*.pd
+ -rm $(OBJECTS_DEST)/*/*.pd
+ -rm $(OBJECTS_DEST)/*.pd
+ -rm $(OBJECTS_DEST)/*/*/*.$(EXTENSION)
+ -rm $(OBJECTS_DEST)/*/*.$(EXTENSION)
+ -rm $(OBJECTS_DEST)/*.$(EXTENSION)
+ -rmdir $(OBJECTS_DEST)/*/*
+ -rmdir $(OBJECTS_DEST)/*
+ -rmdir $(OBJECTS_DEST)
+
+
+ install_clean: applications_clean help_clean manuals_clean objects_clean
+ -rmdir $(DOCS_DEST)
+ -rmdir $(INSTALL_PREFIX)
+ @echo " "
+ @echo "Build destination cleaned: $(INSTALL_PREFIX)"
+
+
+ cruft_clean:
+ # emacs litter
+ -rm -f -- */*/*/*/*.*~
+ -rm -f -- */*/*/*.*~
+ -rm -f -- */*/*.*~
+ -rm -f -- */*.*~
+ -rm -f -- *.*~
+ # sed replace litter
+ -rm -f -- */*/*/*/*.*.bak
+ -rm -f -- */*/*/*.*.bak
+ -rm -f -- */*/*.*.bak
+ -rm -f -- */*.*.bak
+ -rm -f -- *.*.bak
+ # autoconf cache
+ -rm -rf -- */*/*/*/autom4te.cache
+ -rm -rf -- */*/*/autom4te.cache
+ -rm -rf -- */*/autom4te.cache
+ -rm -rf -- */autom4te.cache
+ -rm -rf -- autom4te.cache
+
+
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile 17 Nov 2005 01:05:23 -0000 1.5
--- Makefile 18 Nov 2005 18:05:53 -0000 1.6
***************
*** 15,19 ****
# default target
! all: abstractions doc externals gem pd
@echo "Complete build succeeded!"
--- 15,19 ----
# default target
! all: abstractions doc externals flext gem pd
@echo "Complete build succeeded!"
***************
*** 24,51 ****
DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
SRC_ROOT_DIR=$(SRC_ROOT_DIR) \
! INSTALL_PREFIX=$(INSTALL_PREFIX)
! # APPLICATIONS_DEST=$(APPLICATIONS_DEST) \
! # DOCS_DEST=$(DOCS_DEST) \
! # HELP_DEST=$(HELP_DEST) \
! # MANUALS_DEST=$(MANUALS_DEST) \
! # OBJECTS_DEST=$(OBJECTS_DEST)
!
! #------------------------------------------------------------------------------
! # which OS to compile for
! UNAME := $(shell uname -s)
! ifeq ($(UNAME),Linux)
! OS_NAME = linux
! else
! ifeq ($(UNAME),Darwin)
! OS_NAME = darwin
! else
! ifeq (MINGW,$(findstring MINGW,$(UNAME)))
! OS_NAME = win
! else
! OS_NAME = unknown
! $(warning WARNING: unknown environment "$(UNAME)".)
! endif
! endif
! endif
#==============================================================================#
--- 24,29 ----
DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
SRC_ROOT_DIR=$(SRC_ROOT_DIR) \
! INSTALL_PREFIX=$(INSTALL_PREFIX) \
! UNAME=$(UNAME)
#==============================================================================#
***************
*** 58,62 ****
# abstractions
abstractions:
! make -f $(ABSTRACTIONS_SRC)/Makefile $(DEST_PATHS) install
#------------------------------------------------------------------------------
--- 36,40 ----
# abstractions
abstractions:
!
#------------------------------------------------------------------------------
***************
*** 67,85 ****
#------------------------------------------------------------------------------
# externals
! externals: externals_$(OS_NAME)
! # doc
! make -f $(EXTERNALS_SRC)/build/doc/makefile $(DEST_PATHS) install
! @echo "Making externals for $(OS_NAME) aka $(UNAME)"
! make -f $(EXTERNALS_SRC)/build/$(OS_NAME)/makefile $(DEST_PATHS) install
!
! # these targets are for platform-specific needs
! externals_darwin:
- externals_linux:
! externals_win:
- externals_unknown:
- # this target is for "everything else"
#------------------------------------------------------------------------------
--- 45,56 ----
#------------------------------------------------------------------------------
# externals
! externals:
! cd $(EXTERNALS_SRC) && make $(DEST_PATHS)
! #------------------------------------------------------------------------------
! # flext
! flext:
#------------------------------------------------------------------------------
***************
*** 92,95 ****
--- 63,108 ----
pd:
+ #==============================================================================#
+ #
+ # INSTALL TARGETS
+ #
+ #==============================================================================#
+
+ #------------------------------------------------------------------------------
+ # abstractions
+ abstractions_install:
+ cd $(ABSTRACTIONS_SRC) && make $(DEST_PATHS) install
+
+ #------------------------------------------------------------------------------
+ # doc
+ doc_install:
+
+
+ #------------------------------------------------------------------------------
+ # externals
+ externals_install:
+ cd $(EXTERNALS_SRC) && make $(DEST_PATHS) install
+
+
+ #------------------------------------------------------------------------------
+ # flext_install
+ flext_install:
+
+
+ #------------------------------------------------------------------------------
+ # Gem
+ gem_install:
+
+
+ #------------------------------------------------------------------------------
+ # pd
+ pd_install:
+
+
+ #------------------------------------------------------------------------------
+ # install
+ install: abstractions_install doc_install externals_install flext_install
+ install: gem_install pd_install
+ @echo "Complete install succeeded!"
#==============================================================================#
***************
*** 97,110 ****
#==============================================================================#
abstractions_clean:
! make -f $(ABSTRACTIONS_SRC)/Makefile $(DEST_PATHS) clean
externals_clean:
! make -f $(EXTERNALS_SRC)/build/$(OS_NAME)/makefile $(DEST_PATHS) clean
! clean: abstractions_clean
! -rm -f *~
! rm -rf $(MANUALS_DEST) $(HELP_DEST)
! rmdir $(DOCS_DEST) $(INSTALL_PREFIX)
--- 110,134 ----
#==============================================================================#
abstractions_clean:
! -cd $(ABSTRACTIONS_SRC) && make $(DEST_PATHS) clean
!
!
! doc_clean:
externals_clean:
! -cd $(EXTERNALS_SRC) && make $(DEST_PATHS) clean
+ flext_clean:
!
! gem_clean:
!
!
! pd_clean:
!
! # these targets are all from Makefile.buildlayout:
! # install_clean cruft_clean
! clean: abstractions_clean doc_clean externals_clean flext_clean
! clean: gem_clean pd_clean
! echo "Complete clean finished."
Index: TODO
===================================================================
RCS file: /cvsroot/pure-data/packages/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TODO 16 Nov 2005 16:57:34 -0000 1.2
--- TODO 18 Nov 2005 18:05:53 -0000 1.3
***************
*** 1,3 ****
--- 1,18 ----
+ - make abstraction -lib loader. when a -lib mylibrary name is tried and fails
+ in the path, then fails with IO's altname, then try to load as a path on top
+ of extra: i.e. extra/mylibrary. If found, add to path, and add
+ doc/5.reference/mylibrary to helppath.
+
+ - call it sys_load_lib_folder();,
+
+ - insert it after if (!sys_load_lib()) in s_main.c
+
+ - make pd section since I can't easily modify the pd tree
+
+ - add notes.txt to manuals
+
+ - create patch system and incorporate IO's hex patch
+
- hex convertor for setup function names, and object file names
More information about the Pd-cvs
mailing list