Ver código fonte

delete old modbuild junk

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40176 15284696-431f-4ddb-bdfa-cd5b030d7da7
William Kyngesburye 15 anos atrás
pai
commit
0e60b277b4

+ 0 - 2
macosx/Makefile

@@ -53,7 +53,6 @@ install-macosx:
 real-install-macosx: INST_DIR_TARGET = ${INST_DIR}
 real-install-macosx: PREFIX_TARGET = ${prefix}
 real-install-macosx: install-basic-macosx macosx-support-dir bundle-macosx
-	-cd ${GISBASE} ; tar cBf - modbuild | (cd ${MACOSX_SUPPDIR} ; tar xBf - ) 2>/dev/null
 	@# help file package
 	${LN_DIR} "${INST_DIR_TARGET}/docs/html" /Library/Documentation/Help/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
 
@@ -72,7 +71,6 @@ bindist-macosx: install-basic-macosx bundle-macosx
 	-sed -e "s#@GRASS_VERSION_MAJOR@#${GRASS_VERSION_MAJOR}#g" -e "s#@GRASS_VERSION_MINOR@#${GRASS_VERSION_MINOR}#g" -e "s#@GRASS_VERSION_RELEASE@#${GRASS_VERSION_RELEASE}#g" -e "s#@VER_MINOR_REL@#${VER_MINOR_REL}#g" -e "s#@VER_DATE@#${VER_DATE}#g" -e "s#@PKG_INST_DIR@#${PKG_INST_DIR}#g" pkg/resources/Info.plist.in > dist/Info.plist
 	-${INSTALL_DATA} pkg/resources/License.rtf dist/resources
 	-${INSTALL_DATA} pkg/resources/ReadMe.rtf dist/resources
-	@#-cd ${GISBASE} ; tar cBf - modbuild | (cd ${GRASS_HOME}/macosx/dist/resources ; tar xBf - ) 2>/dev/null
 	@# build the package
 ifeq ($(XCODE_VER),xcode3)
 	${PACKAGEMAKER} --target 10.4 --root-volume-only --id org.osgeo.grass --root dist/${MACOSX_APP_NAME} --info dist/Info.plist --out "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg" --resources dist/resources

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 375
macosx/modbuild/License.rtf


+ 0 - 59
macosx/modbuild/Makefile

@@ -1,59 +0,0 @@
-# Makefile for building Mac OS X addon module build skeleton
-
-MODULE_TOPDIR = ../..
-
-include $(MODULE_TOPDIR)/include/Make/Other.make
-
-ifndef MACOSX_APP_NAME
-	MACOSX_APP_NAME = GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app
-endif
-MACOSX_APPDIR = ${MACOSX_APP_NAME}/Contents/MacOS
-INST_DIR_MACOSX = ${prefix}/${MACOSX_APPDIR}
-
-default: modbuild
-
-modbuild: ReadMe.rtf
-	mkdir -p $(ARCH_DISTDIR)/modbuild
-	-cp -f License.rtf $(ARCH_DISTDIR)/modbuild/
-	-cp -f ReadMe.rtf $(ARCH_DISTDIR)/modbuild/
-	mkdir -p $(ARCH_DISTDIR)/modbuild/dist.$(ARCH)
-	-cp -rf $(ARCH_DISTDIR)/demolocation $(ARCH_DISTDIR)/modbuild/dist.$(ARCH)/
-	-sed -e 's,^GISDBASE.*,GISDBASE = /Library/GRASS/$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)/modbuild/dist.$(ARCH),g' $(ARCH_DISTDIR)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) > $(ARCH_DISTDIR)/modbuild/dist.$(ARCH)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
-	mkdir -p $(ARCH_DISTDIR)/modbuild/module
-	mkdir -p $(ARCH_DISTDIR)/modbuild/include/Make
-	-cp $(MODULE_TOPDIR)/include/Make/Dir.make $(ARCH_DISTDIR)/modbuild/include/Make/
-	-cp $(MODULE_TOPDIR)/include/Make/Doxygen.make $(ARCH_DISTDIR)/modbuild/include/Make/
-	@# need a little change in Grass.make
-	-sed -E -e 's,@GRASS_LIB_PREFIX@,lib,g' \
-	-e 's,@GRASS_LIB_SUFFIX@,.dylib,g' \
-	-e 's,@GRASS_LIBRARY_TYPE@,shlib,g' \
-	-e 's,@GRASS_VERSION_MAJOR@,$(GRASS_VERSION_MAJOR),g' \
-	-e 's,@GRASS_VERSION_MINOR@,$(GRASS_VERSION_MINOR),g' \
-	-e 's,@GRASS_VERSION_RELEASE@,$(GRASS_VERSION_RELEASE),g' \
-	-e 's,@GRASS_VERSION_DATE@,$(GRASS_VERSION_DATE),g' \
-	-e 's#^ARCH_INC[[:space:]].*#& -I$$(GISBASE)/include#g' \
-	-e 's#^ARCH_LIBPATH.*#& -L$$(GISBASE)/lib#g' \
-	-e 's#^GISBASE.*#GISBASE = $$(GRASS_APP)/Contents/MacOS#g' \
-	$(MODULE_TOPDIR)/include/Make/Grass.make.in > $(ARCH_DISTDIR)/modbuild/include/Make/Grass.make
-	@# until I figure out how to get sed to replace with multiple lines in a
-	@# makefile, GRASS_APP required for modbuild, ie no default to /Applications
-	@#-e 's#^GISBASE.*#ifdef GRASS_APP\
-	@#GISBASE = $$(GRASS_APP)/Contents/MacOS\
-	@#else\
-	@#GISBASE = $(INST_DIR_MACOSX)\
-	@#endif#g'
-	@# html.make needs a little change
-	sed -e 's,GISRC=$$(RUN_GISBASE),GISRC=/Library/GRASS/$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)/modbuild/dist.$$(ARCH),g' $(MODULE_TOPDIR)/include/Make/Html.make > $(ARCH_DISTDIR)/modbuild/include/Make/Html.make
-	-cp $(MODULE_TOPDIR)/include/Make/Lib.make $(ARCH_DISTDIR)/modbuild/include/Make/
-	sed -e 's,$$(DEPENDENCIES),,g' $(MODULE_TOPDIR)/include/Make/Module.make > $(ARCH_DISTDIR)/modbuild/include/Make/Module.make
-	@# platform.make changes
-	sed -e 's,^GRASS_HOME.*,GRASS_HOME = $$(GRASS_HOME),g' \
-	-e 's,^RUN_GISBASE.*,RUN_GISBASE = $$(GISBASE),g' \
-	$(MODULE_TOPDIR)/include/Make/Platform.make > $(ARCH_DISTDIR)/modbuild/include/Make/Platform.make
-	-cp $(MODULE_TOPDIR)/include/Make/Rules.make $(ARCH_DISTDIR)/modbuild/include/Make/
-	sed -e 's,GISRC=$$(RUN_GISBASE),GISRC=/Library/GRASS/$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)/modbuild/dist.$$(ARCH),g' $(MODULE_TOPDIR)/include/Make/Script.make > $(ARCH_DISTDIR)/modbuild/include/Make/Script.make
-	-cp $(MODULE_TOPDIR)/include/Make/Shlib.make $(ARCH_DISTDIR)/modbuild/include/Make/
-	-cp $(MODULE_TOPDIR)/include/Make/Stlib.make $(ARCH_DISTDIR)/modbuild/include/Make/
-	mkdir -p $(ARCH_DISTDIR)/modbuild/tools/g.html2man
-	-cp $(MODULE_TOPDIR)/tools/g.html2man/g.html2man $(ARCH_DISTDIR)/modbuild/tools/g.html2man/
-	-cp $(MODULE_TOPDIR)/tools/mkhtml.sh $(ARCH_DISTDIR)/modbuild/tools/

+ 0 - 81
macosx/modbuild/Platform.make.in

@@ -1,81 +0,0 @@
-#############################################################################
-#
-# MODULE:   	Grass Compilation
-#
-#  trimmed down version for building external modules for Mac OS X GRASS.app
-#  External modules shouldn't need all the dependency info, since they should
-#  only be linking to GRASS libraries, or extra libraries configured in
-#  their makefiles
-#
-#############################################################################
-
-############################## Make Variables ###############################
-
-CC                  = gcc
-CXX                 = c++
-LEX                 = flex
-YACC                = bison -y
-PERL                = /usr/bin/perl
-AR                  = ar
-RANLIB              = ranlib
-MKDIR               = mkdir -p
-CHMOD               = chmod
-INSTALL             = /usr/bin/install -c 
-INSTALL_DATA        = ${INSTALL} -m 644
-
-ARCH                = apple-darwin
-prefix              = /usr/local
-exec_prefix         = ${prefix}
-UNIX_BIN            = ${exec_prefix}/bin
-INST_DIR            = @INSTALLDIR@
-GRASSMANDIR         = ${prefix}/man
-
-DL_LIBS             = 
-DL_OBJS             = 
-PLAT_OBJS           = 
-STRIPFLAG           = 
-CC_SEARCH_FLAGS     = 
-LD_SEARCH_FLAGS     = 
-LD_LIBRARY_PATH_VAR = DYLD_LIBRARY_PATH
-LIB_RUNTIME_DIR     = $(ARCH_LIBDIR)
-
-#static libs:
-STLIB_LD            = ${AR} cr
-STLIB_PREFIX        = lib
-STLIB_SUFFIX        = .a
-
-#shared libs
-SHLIB_PREFIX        = lib
-SHLIB_LD            = gcc -dynamiclib -compatibility_version ${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR} -current_version ${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR} -install_name ${INST_DIR}/lib/lib${LIB_NAME}${SHLIB_SUFFIX}
-SHLIB_LD_EXTRAS     = 
-SHLIB_LD_FLAGS      = 
-SHLIB_LD_LIBS       = ${LIBS}
-SHLIB_CFLAGS        = 
-SHLIB_SUFFIX        = .dylib
-EXE                 = 
-
-
-# GRASS dirs
-GRASS_HOME          = $(GRASS_HOME)
-RUN_GISBASE         = $(GISBASE)
-
-DEFAULT_DATABASE    =
-DEFAULT_LOCATION    =
-
-CPPFLAGS            = 
-CFLAGS1             = -Os -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-CXXFLAGS1           = -Os -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-INCLUDE_DIRS        = 
-
-COMPILE_FLAGS       = $(CPPFLAGS) $(CFLAGS1) $(INCLUDE_DIRS)
-COMPILE_FLAGS_CXX   = $(CPPFLAGS) $(CXXFLAGS1) $(INCLUDE_DIRS)
-LINK_FLAGS          = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-
-#Large File Support (LFS)
-USE_LARGEFILES      = 1
-
-#BSD sockets
-HAVE_SOCKET         = 1
-
-GDALCFLAGS          = @GDAL_CFLAGS@
-PROJINC             = @PROJINC@ $(GDALCFLAGS)

+ 0 - 169
macosx/modbuild/ReadMe.rtf

@@ -1,169 +0,0 @@
-{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf420
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fnil\fcharset77 Monaco;
-\f3\fswiss\fcharset77 Helvetica-Oblique;}
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww11220\viewh11220\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc\pardirnatural
-
-\f0\b\fs36 \cf0 Building Addon Modules for\
-Mac OS X GRASS.app\
-
-\f1\b0\fs32 (without GEM)\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\fs28 \cf0 \
-GEM is a nice idea, but there are a few issues.  Not many modules are setup for GEM (there are a couple in the new SVN repository, and some by the GEM author).  It puts the resulting files in the GRASS binary folder and alters the GUI menus in the application package, and this is Not a Good Thing to do with Mac OS X applications.\
-\
-The method is similar to GEM in that it uses a minimal template of the GRASS source and uses the needed headers and libraries from GRASS.app.  But there is less setup needed (for developers), and you don't need admin privileges to install and use the module, except in some more complex cases.  Though a user does need to do a little setup, unlike with GEM.\
-\
-It's a bit rough right now.  It doesn't have a module registry like GEM.  It doesn't add modules to the GUI menu, though the menu is dynamically maintained by the GRASS.app startup.\
-\
-I haven't tried it with a module that also includes its own library.\
-\
-
-\f0\b Note:
-\f1\b0  if there is no makefile in the module source, it's probably just a script that you can simply copy to the bin folder (see \ul Use\ulnone  section below).\
-\
-\
-
-\f0\b Requirements\
-
-\f1\b0 \
-- Xcode - at least version 2.3 (scripts shouldn't need this).\
-\
-- GRASS.app (you don't need the full GRASS source).\
-\
-- Module source.  It should be compatible with the GRASS.app version you use.\
-\
-- This modbuild template.\
-\
-\
-
-\f0\b Setup\
-
-\f1\b0 \
-
-\f2\fs24 $VERSION
-\f1\fs28  is the major.minor GRASS version.\
-\
-- copy the modbuild folder from 
-\f2\fs24 /Library/GRASS/$VERSION/
-\f1\fs28  to a location you have read/write access to.  You could use your home 
-\f2\fs24 /Library/GRASS/$VERSION/
-\f1\fs28 , for example.\
-\
-- Unpack the module source and put that source folder in the '
-\f2\fs24 module
-\f1\fs28 ' folder in the modbuild folder.  If the module source is setup for GEM, you'll have to dig into the src/[section] subfolder to find the module's source folder (ie src/raster/module.source.folder).  You should end up with your template folder like so:\
-\
-
-\f2\fs24 modbuild\
-	dist.some-platform-version\
-	include\
-	License.rtf\
-	module\
-		module_source_folder\
-			description.html (this might have the module name instead)\
-			main.c\
-			makefile\
-			(other_src.c)\
-			(other_header.h)\
-	ReadMe.rtf\
-	tools\
-
-\f1\fs28 \
-
-\f0\b NOTE:
-\f1\b0  make sure that there are no spaces in the path to the modbuild folder.\
-\
-- If the module uses extra data file(s) that are stored in the 
-\f2\fs24 etc/
-\f1\fs28  folder (v.in.dwg does this), make sure it uses the new 
-\f2\fs24 G_find_etc()
-\f1\fs28  function (for C modules) or the 
-\f2\fs24 g.findetc
-\f1\fs28  module (for script modules) instead of the hardwired 
-\f2\fs24 $GISBASE/etc/
-\f1\fs28 .  This will mean either asking the author to make this change or attempting it yourself.  See the developer documentation for usage of G_find_etc(), and the GRASS Help for usage of g.findetc.\
-\
-- In a Terminal, 
-\f2\fs24 cd
-\f1\fs28  to the module source folder, then:\
-\
-
-\f2\fs24 $ make GRASS_HOME='/path/to/grass/modbuild' GRASS_APP='/path/to/GRASS.app'\
-
-\f1\fs28 \
-The modbuild path is the path to the 
-\f2\fs24 modbuild
-\f1\fs28  folder, not the module source folder.  Make sure to include the correct GRASS.app name in the GRASS_APP path (ie GRASS-6.3.app).\
-\
-\
-
-\f0\b Use
-\f1\b0 \
-\
-The module files will be in the 
-\f2\fs24 dist
-\f1\fs28  folder in this template.  A C source module will be in 
-\f2\fs24 bin
-\f1\fs28 , script modules will be in 
-\f2\fs24 scripts
-\f1\fs28 , and documentation will be in 
-\f2\fs24 docs/html
-\f1\fs28 .  GRASS.app has a couple default locations for addon modules that use the same configuration as the GRASS_ADDON_PATH environment variable: 
-\f2\fs24 /Library/GRASS/$VERSION/Modules
-\f1\fs28  and 
-\f2\fs24 ~/Library/GRASS/$VERSION/Modules
-\f1\fs28 .  The version is the Major.minor GRASS version.  Modules that should be available to all users should be installed in 
-\f2\fs24 /Library
-\f1\fs28  (requires admin privileges), and any modules in 
-\f2\fs24 ~/Library
-\f1\fs28  will only be available to the user that installs them.  The user GRASS folder will be created the first time GRASS is run.\
-\
-
-\f3\i Installation is not automatic.
-\f1\i0   You must manually copy the files because the install targets in the GRASS make system only exist in the GRASS source.\
-\
-- Both 
-\f0\b scripts
-\f1\b0  and 
-\f0\b binary
-\f1\b0  executables can be run from the same location, so install them in the 
-\f2\fs24 bin/
-\f1\fs28  folder.\
-- Any 
-\f0\b libraries
-\f1\b0  should go in the 
-\f2\fs24 lib/
-\f1\fs28  folder.\
-- 
-\f0\b Documentation
-\f1\b0  goes in the 
-\f2\fs24 docs/html/
-\f1\fs28  folder.\
-- 
-\f0\b Data
-\f1\b0  files should go into 
-\f2\fs24 etc/
-\f1\fs28 .\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-\cf0 \
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-
-\fs24 \cf0 \'a9 2006-2007 by the GRASS Development Team\
-This program is free software under the GNU General Public License (>=v2).\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-
-\fs28 \cf0 \
-\
-- William Kyngesburye\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "mailto:kyngchaos@kyngchaos.com"}}{\fldrslt \cf0 kyngchaos@kyngchaos.com}}
-\fs24 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://www.kyngchaos.com"}}{\fldrslt 
-\fs28 \cf0 http://www.kyngchaos.com/}}
-\fs28 \
-}