From 0d452c8f34013b611a54c746a71c05e28796eae2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 23 Apr 2013 19:53:25 +0200 Subject: [PATCH] Remove the TrackerNewTemplates optional package Instead add the files to the tree and generate the resulting files on the fly. This also avoids the undesired attributes the files in the package had. --- build/jam/HaikuImage | 9 ++ build/jam/OptionalPackages | 10 -- build/jam/ReleaseBuildProfiles | 3 +- src/data/Jamfile | 1 + src/data/settings/Jamfile | 3 + .../settings/tracker_new_templates/C++ header | 17 +++ .../settings/tracker_new_templates/C++ source | 6 + .../settings/tracker_new_templates/Jamfile | 18 +++ .../settings/tracker_new_templates/makefile | 125 ++++++++++++++++++ .../settings/tracker_new_templates/text file | 0 10 files changed, 180 insertions(+), 12 deletions(-) create mode 100644 src/data/settings/Jamfile create mode 100644 src/data/settings/tracker_new_templates/C++ header create mode 100644 src/data/settings/tracker_new_templates/C++ source create mode 100644 src/data/settings/tracker_new_templates/Jamfile create mode 100644 src/data/settings/tracker_new_templates/makefile create mode 100644 src/data/settings/tracker_new_templates/text file diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 799cc0c13b..580bdb670b 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -265,6 +265,15 @@ AddDirectoryToHaikuImage home config boot launch ; AddFilesToHaikuImage home config settings Mail ProviderInfo : $(HAIKU_PROVIDER_INFOS) ; +# Add Tracker New Templates +AddFilesToHaikuImage home config settings Tracker "Tracker New Templates" + : + "C++ header" + "C++ source" + "makefile" + "text file" +; + local etcDir = [ FDirName $(HAIKU_TOP) data etc ] ; local etcFiles = inputrc profile ; etcFiles = $(etcFiles:G=etc) ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 11bf1629a1..dcdd55eda9 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -73,7 +73,6 @@ # TagLib - id3 tag library # Tar - archiving utility # TimGMSoundFont - a good quality General MIDI Sound Font -# TrackerNewTemplates - template files for Tracker's New menu # Transmission - a fast, easy, and free BitTorrent Client # UserlandFS - aids native file system development (like FUSE) # Vim - Vi IMproved. Highly configurable text editor @@ -1338,15 +1337,6 @@ if [ IsOptionalHaikuImagePackageAdded TimGMSoundFont ] { } -# TrackerNewTemplates -if [ IsOptionalHaikuImagePackageAdded TrackerNewTemplates ] { - InstallOptionalHaikuImagePackage - $(baseURL)/TrackerNewTemplates-2010-04-26.zip - : home config settings Tracker "Tracker New Templates" - ; -} - - # Transmission if [ IsOptionalHaikuImagePackageAdded Transmission ] { if $(TARGET_ARCH) != x86 { diff --git a/build/jam/ReleaseBuildProfiles b/build/jam/ReleaseBuildProfiles index 2958c676ad..a4111b2df8 100644 --- a/build/jam/ReleaseBuildProfiles +++ b/build/jam/ReleaseBuildProfiles @@ -19,8 +19,7 @@ switch $(HAIKU_BUILD_PROFILE) { HAIKU_IMAGE_SIZE = 750 ; HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ; - AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates - WQY-MicroHei ; + AddOptionalHaikuImagePackages TimGMSoundFont WQY-MicroHei ; AddOptionalHaikuImagePackages BePDF Pe Vision WebPositive WonderBrush ; AddOptionalHaikuImagePackages CVS Development Git Mercurial diff --git a/src/data/Jamfile b/src/data/Jamfile index 8be659eb29..ff8475313b 100644 --- a/src/data/Jamfile +++ b/src/data/Jamfile @@ -2,3 +2,4 @@ SubDir HAIKU_TOP src data ; HaikuSubInclude etc ; HaikuSubInclude keymaps ; +HaikuSubInclude settings ; diff --git a/src/data/settings/Jamfile b/src/data/settings/Jamfile new file mode 100644 index 0000000000..c550b4280c --- /dev/null +++ b/src/data/settings/Jamfile @@ -0,0 +1,3 @@ +SubDir HAIKU_TOP src data settings ; + +HaikuSubInclude tracker_new_templates ; diff --git a/src/data/settings/tracker_new_templates/C++ header b/src/data/settings/tracker_new_templates/C++ header new file mode 100644 index 0000000000..5abbba7563 --- /dev/null +++ b/src/data/settings/tracker_new_templates/C++ header @@ -0,0 +1,17 @@ +/* + * Copyright 2010 Your Name + * All rights reserved. Distributed under the terms of the MIT license. + */ +#ifndef _H +#define _H + +#include + +class { +public: + +private: + +}; + +#endif // _H diff --git a/src/data/settings/tracker_new_templates/C++ source b/src/data/settings/tracker_new_templates/C++ source new file mode 100644 index 0000000000..382c05c26d --- /dev/null +++ b/src/data/settings/tracker_new_templates/C++ source @@ -0,0 +1,6 @@ +/* + * Copyright 2010 Your Name + * All rights reserved. Distributed under the terms of the MIT license. + */ +#include ".h" + diff --git a/src/data/settings/tracker_new_templates/Jamfile b/src/data/settings/tracker_new_templates/Jamfile new file mode 100644 index 0000000000..6fd17aaafd --- /dev/null +++ b/src/data/settings/tracker_new_templates/Jamfile @@ -0,0 +1,18 @@ +SubDir HAIKU_TOP src data settings tracker_new_templates ; + + +rule PrepareTrackerNewTemplates source : mimeType +{ + local source = [ FGristFiles $(source) ] ; + local target = $(source:G=tracker-new-templates) ; + MakeLocateCommonPlatform $(target) ; + File $(target) : $(source) ; + TARGET_EXECUTABLE_MIME_TYPE on $(target) = $(mimeType) ; + SetType $(target) ; +} + + +PrepareTrackerNewTemplates "C++ header" : text/x-source-code ; +PrepareTrackerNewTemplates "C++ source" : text/x-source-code ; +PrepareTrackerNewTemplates "makefile" : text/x-makefile ; +PrepareTrackerNewTemplates "text file" : text/plain ; diff --git a/src/data/settings/tracker_new_templates/makefile b/src/data/settings/tracker_new_templates/makefile new file mode 100644 index 0000000000..e50b2b05f4 --- /dev/null +++ b/src/data/settings/tracker_new_templates/makefile @@ -0,0 +1,125 @@ +## BeOS Generic Makefile v2.3 ## + +## Fill in this file to specify the project being created, and the referenced +## makefile-engine will do all of the hard work for you. This handles both +## Intel and PowerPC builds of the BeOS and Haiku. + +## Application Specific Settings --------------------------------------------- + +# specify the name of the binary +NAME= + +# specify the type of binary +# APP: Application +# SHARED: Shared library or add-on +# STATIC: Static library archive +# DRIVER: Kernel Driver +TYPE= + +# add support for new Pe and Eddie features +# to fill in generic makefile + +#%{ +# @src->@ + +# specify the source files to use +# full paths or paths relative to the makefile can be included +# all files, regardless of directory, will have their object +# files created in the common object directory. +# Note that this means this makefile will not work correctly +# if two source files with the same name (source.c or source.cpp) +# are included from different directories. Also note that spaces +# in folder names do not work well with this makefile. +SRCS= + +# specify the resource definition files to use +# full path or a relative path to the resource file can be used. +RDEFS= + +# specify the resource files to use. +# full path or a relative path to the resource file can be used. +# both RDEFS and RSRCS can be defined in the same makefile. +RSRCS= + +# @<-src@ +#%} + +# end support for Pe and Eddie + +# specify additional libraries to link against +# there are two acceptable forms of library specifications +# - if your library follows the naming pattern of: +# libXXX.so or libXXX.a you can simply specify XXX +# library: libbe.so entry: be +# +# - if your library does not follow the standard library +# naming scheme you need to specify the path to the library +# and it's name +# library: my_lib.a entry: my_lib.a or path/my_lib.a +LIBS= + +# specify additional paths to directories following the standard +# libXXX.so or libXXX.a naming scheme. You can specify full paths +# or paths relative to the makefile. The paths included may not +# be recursive, so include all of the paths where libraries can +# be found. Directories where source files are found are +# automatically included. +LIBPATHS= + +# additional paths to look for system headers +# thes use the form: #include
+# source file directories are NOT auto-included here +SYSTEM_INCLUDE_PATHS = + +# additional paths to look for local headers +# thes use the form: #include "header" +# source file directories are automatically included +LOCAL_INCLUDE_PATHS = + +# specify the level of optimization that you desire +# NONE, SOME, FULL +OPTIMIZE= + +# specify any preprocessor symbols to be defined. The symbols will not +# have their values set automatically; you must supply the value (if any) +# to use. For example, setting DEFINES to "DEBUG=1" will cause the +# compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" +# would pass "-DDEBUG" on the compiler's command line. +DEFINES= + +# specify special warning levels +# if unspecified default warnings will be used +# NONE = supress all warnings +# ALL = enable all warnings +WARNINGS = + +# specify whether image symbols will be created +# so that stack crawls in the debugger are meaningful +# if TRUE symbols will be created +SYMBOLS = + +# specify debug settings +# if TRUE will allow application to be run from a source-level +# debugger. Note that this will disable all optimzation. +DEBUGGER = + +# specify additional compiler flags for all files +COMPILER_FLAGS = + +# specify additional linker flags +LINKER_FLAGS = + +# specify the version of this particular item +# (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") +# This may also be specified in a resource. +APP_VERSION = + +# (for TYPE == DRIVER only) Specify desired location of driver in the /dev +# hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will +# instruct the driverinstall rule to place a symlink to your driver's binary in +# ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at +# /dev/video/usb when loaded. Default is "misc". +DRIVER_PATH = + +## include the makefile-engine +include $(BUILDHOME)/etc/makefile-engine diff --git a/src/data/settings/tracker_new_templates/text file b/src/data/settings/tracker_new_templates/text file new file mode 100644 index 0000000000..e69de29bb2