Ticket #11158: 0001-Template-Makefile-fix-wording-rewrap-bump-version-ca.patch

build/jam/packages/MakefileEngine

@@ -3 +3 @@
 
 # skeleton makefile and makefile-engine
 local makefileEngineFiles =
-    <makefile-engine>makefile
+    <makefile-engine>Makefile
     <makefile-engine>makefile-engine
 ;
 SEARCH on $(makefileEngineFiles) = [ FDirName $(HAIKU_TOP) data develop ] ;

new file data/develop/Makefile

@@ +1 @@
+## Haiku Generic Makefile v2.6 ## 
+
+## 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 any
+## architecture of Haiku.
+
+# The name of the binary.
+NAME = 
+
+# The type of binary, must be one of:
+#   APP:    Application
+#   SHARED: Shared library or add-on
+#   STATIC: Static library archive
+#   DRIVER: Kernel driver
+TYPE = 
+
+#   If you plan to use localization, specify the application's MIME signature.
+APP_MIME_SIG = 
+
+#   The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are
+#   so that Pe and Eddie can fill them in for you.
+#%{
+# @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 or relative paths can be
+#   used.
+RDEFS = 
+
+#   Specify the resource files to use. Full or relative paths can be used.
+#   Both RDEFS and RSRCS can be utilized in the same Makefile.
+RSRCS = 
+
+# End Pe/Eddie support.
+# @<-src@ 
+#%}
+
+#   Specify 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 for the library. (e.g. the entry for
+#       "libtracker.so" would be "tracker")
+#
+#   -   for GCC-independent linking of standard C++ libraries, you can use
+#       $(STDCPPLIBS) instead of the raw "stdc++[.r4] [supc++]" library names.
+#
+#   -   if your library does not follow the standard library naming scheme,
+#       you need to specify the path to the library and it's name.
+#       (e.g. for mylib.a, specify "mylib.a" or "path/mylib.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 are not parsed recursively, so
+#   include all of the paths where libraries must be found. Directories where
+#   source files were specified are automatically included.
+LIBPATHS = 
+
+#   Additional paths to look for system headers. These use the form
+#   "#include <header>". Directories that contain the files in SRCS are
+#   NOT auto-included here.
+SYSTEM_INCLUDE_PATHS = 
+
+#   Additional paths paths to look for local headers. These use the form
+#   #include "header". Directories that contain the files in SRCS are
+#   automatically included.
+LOCAL_INCLUDE_PATHS = 
+
+#   Specify the level of optimization that you want. Specify either NONE (O0),
+#   SOME (O1), FULL (O2), or leave blank (for the default optimization level).
+OPTIMIZE := 
+
+#   Specify the codes for languages you are going to support in this
+#   application. The default "en" one must be provided too. "make catkeys"
+#   will recreate only the "locales/en.catkeys" file. Use it as a template
+#   for creating catkeys for other languages. All localization files must be
+#   placed in the "locales" subdirectory.
+LOCALES = 
+
+#   Specify all the 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 the warning level. Either NONE (suppress all warnings),
+#   ALL (enable all warnings), or leave blank (enable default warnings).
+WARNINGS = 
+
+#   With image symbols, stack crawls in the debugger are meaningful.
+#   If set to "TRUE", symbols will be created.
+SYMBOLS := 
+
+#   Includes debug information, which allows the binary to be debugged easily.
+#   If set to "TRUE", debug info will be created.
+DEBUGGER := 
+
+#   Specify any additional compiler flags to be used.
+COMPILER_FLAGS = 
+
+#   Specify any additional linker flags to be used.
+LINKER_FLAGS = 
+
+#   Specify the version of this binary. 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 := 
+
+#   (Only used when "TYPE" is "DRIVER"). Specify the desired driver install
+#   location in the /dev hierarchy. Example:
+#       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. The default is "misc".
+DRIVER_PATH = 
+
+## Include the Makefile-Engine
+DEVEL_DIRECTORY := \\
+    $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
+include $(DEVEL_DIRECTORY)/etc/makefile-engine

deleted file data/develop/makefile

@@ -1 @@
-## BeOS Generic Makefile v2.5 ##
-
-## 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= 
-
-#   if you plan to use localization features 
-#   specify the application MIME signature
-APP_MIME_SIG= 
-
-#   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
-#
-#   -   for version-independent linking of standard C++ libraries please add
-#       $(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names
-#
-#   -   for localization support add following libs:
-#       locale localestub
-#       
-#   -   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 <header>
-#   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 here the codes for languages you are going
-#   to support in this application. The default "en"
-#   one must be provided too. "make catkeys" will recreate only
-#   locales/en.catkeys file. Use it as template for creating other
-#   languages catkeys. All localization files must be placed
-#   in "locales" sub-directory.
-LOCALES=
-
-#   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
-DEVEL_DIRECTORY := \
-    $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
-include $(DEVEL_DIRECTORY)/etc/makefile-engine

src/data/package_infos/any/makefile_engine

@@ -1 +1 @@
 name            makefile_engine
 version         %HAIKU_VERSION%
 architecture    any
-summary         "The makefile engine"
-description     "A simple generic makefile engine and makefile template."
+summary         "The Makefile engine"
+description     "A simple generic makefile-engine and Makefile template."
 
 packager        "The Haiku build system"
 vendor          "Haiku Project"
 
-copyrights      "? Be Inc. 2001-2013 Haiku, Inc."
+copyrights      "? Be Inc. 2001-2014 Haiku, Inc."
 licenses        MIT
 
 provides {

src/data/settings/tracker_new_templates/Jamfile

@@ -13 +13 @@
 
 PrepareTrackerNewTemplates "C++ header" : text/x-source-code ;
 PrepareTrackerNewTemplates "C++ source" : text/x-source-code ;
-PrepareTrackerNewTemplates "makefile" : text/x-makefile ;
+PrepareTrackerNewTemplates "Makefile" : text/x-makefile ;
 PrepareTrackerNewTemplates "text file" : text/plain ;

new file src/data/settings/tracker_new_templates/Makefile

@@ +1 @@
+## Haiku Generic Makefile v2.6 ## 
+
+## 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 any
+## architecture of Haiku.
+
+# The name of the binary.
+NAME = 
+
+# The type of binary, must be one of:
+#   APP:    Application
+#   SHARED: Shared library or add-on
+#   STATIC: Static library archive
+#   DRIVER: Kernel driver
+TYPE = 
+
+#   If you plan to use localization, specify the application's MIME signature.
+APP_MIME_SIG = 
+
+#   The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are
+#   so that Pe and Eddie can fill them in for you.
+#%{
+# @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 or relative paths can be
+#   used.
+RDEFS = 
+
+#   Specify the resource files to use. Full or relative paths can be used.
+#   Both RDEFS and RSRCS can be utilized in the same Makefile.
+RSRCS = 
+
+# End Pe/Eddie support.
+# @<-src@ 
+#%}
+
+#   Specify 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 for the library. (e.g. the entry for
+#       "libtracker.so" would be "tracker")
+#
+#   -   for GCC-independent linking of standard C++ libraries, you can use
+#       $(STDCPPLIBS) instead of the raw "stdc++[.r4] [supc++]" library names.
+#
+#   -   if your library does not follow the standard library naming scheme,
+#       you need to specify the path to the library and it's name.
+#       (e.g. for mylib.a, specify "mylib.a" or "path/mylib.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 are not parsed recursively, so
+#   include all of the paths where libraries must be found. Directories where
+#   source files were specified are automatically included.
+LIBPATHS = 
+
+#   Additional paths to look for system headers. These use the form
+#   "#include <header>". Directories that contain the files in SRCS are
+#   NOT auto-included here.
+SYSTEM_INCLUDE_PATHS = 
+
+#   Additional paths paths to look for local headers. These use the form
+#   #include "header". Directories that contain the files in SRCS are
+#   automatically included.
+LOCAL_INCLUDE_PATHS = 
+
+#   Specify the level of optimization that you want. Specify either NONE (O0),
+#   SOME (O1), FULL (O2), or leave blank (for the default optimization level).
+OPTIMIZE := 
+
+#   Specify the codes for languages you are going to support in this
+#   application. The default "en" one must be provided too. "make catkeys"
+#   will recreate only the "locales/en.catkeys" file. Use it as a template
+#   for creating catkeys for other languages. All localization files must be
+#   placed in the "locales" subdirectory.
+LOCALES = 
+
+#   Specify all the 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 the warning level. Either NONE (suppress all warnings),
+#   ALL (enable all warnings), or leave blank (enable default warnings).
+WARNINGS = 
+
+#   With image symbols, stack crawls in the debugger are meaningful.
+#   If set to "TRUE", symbols will be created.
+SYMBOLS := 
+
+#   Includes debug information, which allows the binary to be debugged easily.
+#   If set to "TRUE", debug info will be created.
+DEBUGGER := 
+
+#   Specify any additional compiler flags to be used.
+COMPILER_FLAGS = 
+
+#   Specify any additional linker flags to be used.
+LINKER_FLAGS = 
+
+#   Specify the version of this binary. 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 := 
+
+#   (Only used when "TYPE" is "DRIVER"). Specify the desired driver install
+#   location in the /dev hierarchy. Example:
+#       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. The default is "misc".
+DRIVER_PATH = 
+
+## Include the Makefile-Engine
+DEVEL_DIRECTORY := \\
+    $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
+include $(DEVEL_DIRECTORY)/etc/makefile-engine

deleted file src/data/settings/tracker_new_templates/makefile

@@ -1 @@
-## BeOS Generic Makefile v2.5 ##
-
-## 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= 
-
-#   if you plan to use localization features 
-#   specify the application MIME siganture
-APP_MIME_SIG= 
-
-#   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
-#
-#   -   for version-independent linking of standard C++ libraries please add
-#       $(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names
-#
-#   -   for localization support add following libs:
-#       locale localestub
-#       
-#   -   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 <header>
-#   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 here the codes for languages you are going
-#   to support in this application. The default "en"
-#   one must be provided too. "make catkeys" will recreate only
-#   locales/en.catkeys file. Use it as template for creating other
-#   languages catkeys. All localization files must be placed
-#   in "locales" sub-directory.
-LOCALES=
-
-#   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
-DEVEL_DIRECTORY := \
-    $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
-include $(DEVEL_DIRECTORY)/etc/makefile-engine