hrev52282 adds 3 changesets to branch 'master'
old head: 1c2518b407b07052ff5af4e8889c7442a8f6ec2c
new head: 427edfcf0ddc74fc461c9355484d33fd4b027b70
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=427edfcf0ddc+%5E1c2518b407b0
----------------------------------------------------------------------------
7426861a9385: radeon_hd: Add another working device ID.
Fixes #14379. Thanks cb88 for testing!
99158cceddac: makefile-engine docs: Fix app_name_catalog_entry.
Fixes #14392.
427edfcf0ddc: Makefile Engine template: Whitespace cleanup and synchronization.
Also update comment as FULL is O3 not O2, fixing #14396.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 72 insertions(+), 67 deletions(-)
data/develop/Makefile | 53 ++++++++++---------
docs/misc/makefile-engine.html | 30 +++++------
.../kernel/drivers/graphics/radeon_hd/driver.cpp | 1 +
src/data/settings/tracker_new_templates/Makefile | 55 +++++++++++---------
############################################################################
Commit: 7426861a9385def3093b16fd490e27ec2e7ac6cf
URL: https://git.haiku-os.org/haiku/commit/?id=7426861a9385
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Aug 26 01:08:35 2018 UTC
Ticket: https://dev.haiku-os.org/ticket/14379
radeon_hd: Add another working device ID.
Fixes #14379. Thanks cb88 for testing!
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp
b/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp
index dd988a619c..6e00eb6511 100644
--- a/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp
@@ -205,6 +205,7 @@ const struct supported_device {
{0x9802, 4, 1, RADEON_PALM, CHIP_APU, "Radeon HD 6310"},
{0x9803, 4, 1, RADEON_PALM, CHIP_APU, "Radeon HD 6310"},
{0x9806, 4, 1, RADEON_PALM, CHIP_APU, "Radeon HD 6320"},
+ {0x9808, 4, 1, RADEON_PALM, CHIP_APU, "Radeon HD 7340"},
// Sumo (no VGA / LVDS!, only DP)
{0x9640, 4, 1, RADEON_SUMO, CHIP_APU, "Radeon HD 6550D"},
{0x9641, 4, 1, RADEON_SUMO, CHIP_APU, "Radeon HD Sumo"},
############################################################################
Commit: 99158cceddacb52ebe30708c4e6a27b4fb711c8f
URL: https://git.haiku-os.org/haiku/commit/?id=99158cceddac
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Aug 26 01:22:54 2018 UTC
Ticket: https://dev.haiku-os.org/ticket/14392
makefile-engine docs: Fix app_name_catalog_entry.
Fixes #14392.
----------------------------------------------------------------------------
diff --git a/docs/misc/makefile-engine.html b/docs/misc/makefile-engine.html
index 731c7491cd..5cc06a1a72 100644
--- a/docs/misc/makefile-engine.html
+++ b/docs/misc/makefile-engine.html
@@ -6,7 +6,7 @@
<h1>How To Create a Project Using the Makefile Engine</h1>
<p>Haiku helps developers with the build process of their projects by
providing the so
-called makefile-engine. It's made of two files, that reside in
+called makefile-engine. It's made of two files, that reside in
<tt>/boot/system/develop/etc</tt> directory and are named 'Makefile' and
'makefile-engine'.<br />
Together, these two files provide you with a simple ready-to-be used build
engine for your projects.</p>
@@ -15,7 +15,7 @@ engine for your projects.</p>
Makefile template v2.6. Regardless of mentioning the 'makefiles' in this
How-To, the same technique can be used for creating Jamfile-driven
projects. Corresponding Jamfile and Jamfile-engine template files are provided
-with Haiku. We made both, the Makefile and Jamfile engines completely
+with Haiku. We made both, the Makefile and Jamfile engines completely
target-compatible for the user's convenience.</p>
<h2>Contents</h2>
@@ -32,7 +32,7 @@ target-compatible for the user's convenience.</p>
<p>To start a project, just copy Makefile from
<tt>/boot/system/develop/etc</tt> directory, into
your project directory. Write a few files that you want to add to your
project. Add
-either relative or full paths to them into the SRCS variable definition in the
+either relative or full paths to them into the SRCS variable definition in the
Makefile and run <tt>make</tt>. Example files for a "Hello World" project:</p>
<p><em>hello.cpp</em>:</p>
@@ -80,12 +80,12 @@ needs. Let's take a look at them:</p>
<li><strong>STATIC</strong> - Static library archive</li>
<li><strong>DRIVER</strong> - Kernel driver</li>
</ul></li>
-<li><strong>APP_MIME_SIG</strong> specifies the application's mime signature
for
+<li><strong>APP_MIME_SIG</strong> specifies the application's mime signature
for
localization features. Note that it should correspond to MIME type
provided to the BApplication's constructor and the application MIME type
defined in resource file. In case this parameter is not set, the
default value '<tt>x-vnd.Haiku-$(NAME)</tt>' will be used.</li>
-<li><strong>SRCS</strong> specifies the source files to use. You may specify
both, full
+<li><strong>SRCS</strong> specifies the source files to use. You may specify
both, full
paths and paths relative to the location of the Makefile. All objects,
regardless of the location of their sources will be created in the
common object directory. Please note, that this means, that the Makefile
@@ -109,7 +109,7 @@ add <tt>$(STDCPPLIBS</tt> instead of raw "<tt>stdc++[.r4]
[supc++]</tt>" library
<li>for localization support add the following libraries: <tt>locale</tt>
<tt>localestub</tt></li>
<li>if your library doesn't follow the standard library naming
scheme, you need to specify the path to the library and its name, e.g.
-for the library: <tt>my_lib.a</tt>, the entry would be either:
<tt>my_lib.a</tt> or
+for the library: <tt>my_lib.a</tt>, the entry would be either:
<tt>my_lib.a</tt> or
<tt>path/my_lib.a</tt></li>
</ul></li>
<li><strong>LIBPATHS</strong> specifies additional paths to directories
following the
@@ -193,19 +193,19 @@ actually be able to use localization in your programs,
you have to adjust few
settings in your Makefile.</p>
<ol>
-<li><p>Adjust a value to your project's <strong>APP_MIME_SIG</strong>
variable.
+<li><p>Adjust a value to your project's <strong>APP_MIME_SIG</strong> variable.
Application's mime signature should also be set in the following
format: <tt>x.vnd-<author>-<project_name></tt></p></li>
-<li><p>Add following two libraries into your <strong>LIBS</strong> variable:
<tt>locale</tt>
+<li><p>Add following two libraries into your <strong>LIBS</strong> variable:
<tt>locale</tt>
<tt>localestub</tt></p></li>
-<li><p>Add every language, that you want to support, into
<strong>LOCALES</strong> variable,
-e.g. '<tt>LOCALES = en de fr</tt>' for English, German and French locale
+<li><p>Add every language, that you want to support, into
<strong>LOCALES</strong> variable,
+e.g. '<tt>LOCALES = en de fr</tt>' for English, German and French locale
support.</p></li>
-<li><p>Add the resource definition script (also specified in the <em>RDEF</em>
+<li><p>Add the resource definition script (also specified in the <em>RDEF</em>
variable) containing the following entries to project:</p>
<pre>resource app_signature
"application/x-vnd.<author>-<project_name>";
-resource app<em>name</em>catalog_entry
"<author>-<project_name>:System name:Terminal";</pre></li>
+resource app_name_catalog_entry "<author>-<project_name>:System
name:Terminal";</pre></li>
<li><p>Run '<tt>make</tt>' to build the binary file.</p></li>
<li><p>Run '<tt>make catkeys</tt>' to get the <tt>locales/en.catkeys</tt>
file.</p></li>
<li><p>Copy this file to <tt>locales/<language_code>.catkeys</tt> and
translate it,
@@ -250,13 +250,13 @@ everything in the objects folder.</li>
<li><strong>driverinstall</strong> installs the driver in the system.</li>
<li><strong>install</strong> installs the program into the directory specified
by the <em>INSTALL_DIR</em>
variable.</li>
-<li><strong>catalogsinstall</strong> installs localization resource catalogs
into
+<li><strong>catalogsinstall</strong> installs localization resource catalogs
into
<tt>/boot/home/config/non-packaged/data/locale/catalogs/<APP_MIME_SIG></tt>
for testing purposes. Note that for the distribution of a release version,
catalogs should be stored in
<tt>/boot/system/non-packaged/data/locale/catalogs/<APP_MIME_SIG></tt>
instead of
home. Even better, create a proper HPKG and don't install in any non-packaged
folder at all.</li>
-<li><strong>bindcatalogs</strong> binds localization resource catalogs into
the executable
-file's resources (it's an alternative way of storing localization
+<li><strong>bindcatalogs</strong> binds localization resource catalogs into
the executable
+file's resources (it's an alternative way of storing localization
catalogs that doesn't require to distribute separate catalog files).</li>
</ul>
############################################################################
Revision: hrev52282
Commit: 427edfcf0ddc74fc461c9355484d33fd4b027b70
URL: https://git.haiku-os.org/haiku/commit/?id=427edfcf0ddc
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Aug 26 01:24:10 2018 UTC
Ticket: https://dev.haiku-os.org/ticket/14396
Makefile Engine template: Whitespace cleanup and synchronization.
Also update comment as FULL is O3 not O2, fixing #14396.
----------------------------------------------------------------------------
diff --git a/data/develop/Makefile b/data/develop/Makefile
index 4e6aa18225..3bbcbf8728 100644
--- a/data/develop/Makefile
+++ b/data/develop/Makefile
@@ -1,47 +1,48 @@
-## Haiku Generic Makefile v2.6 ##
+## 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.
+##
## For more information, see:
## file:///system/develop/documentation/makefile-engine.html
# The name of the binary.
-NAME =
+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 =
+TYPE =
-# If you plan to use localization, specify the application's MIME
signature.
-APP_MIME_SIG =
+# 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->@
+# @src->@
-# Specify the source files to use. Full paths or paths relative to the
+# 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 =
+SRCS =
# Specify the resource definition files to use. Full or relative paths
can be
# used.
-RDEFS =
+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 =
+RSRCS =
# End Pe/Eddie support.
-# @<-src@
+# @<-src@
#%}
# Specify libraries to link against.
@@ -56,65 +57,65 @@ RSRCS =
# - 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 =
+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 =
+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 =
+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 =
+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 :=
+# SOME (O1), FULL (O3), 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 =
+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 =
+DEFINES =
# Specify the warning level. Either NONE (suppress all warnings),
# ALL (enable all warnings), or leave blank (enable default warnings).
-WARNINGS =
+WARNINGS =
# With image symbols, stack crawls in the debugger are meaningful.
# If set to "TRUE", symbols will be created.
-SYMBOLS :=
+SYMBOLS :=
# Includes debug information, which allows the binary to be debugged
easily.
# If set to "TRUE", debug info will be created.
-DEBUGGER :=
+DEBUGGER :=
# Specify any additional compiler flags to be used.
-COMPILER_FLAGS =
+COMPILER_FLAGS =
# Specify any additional linker flags to be used.
-LINKER_FLAGS =
+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 :=
+APP_VERSION :=
# (Only used when "TYPE" is "DRIVER"). Specify the desired driver install
# location in the /dev hierarchy. Example:
@@ -122,7 +123,7 @@ APP_VERSION :=
# 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 =
+DRIVER_PATH =
## Include the Makefile-Engine
DEVEL_DIRECTORY := \
diff --git a/src/data/settings/tracker_new_templates/Makefile
b/src/data/settings/tracker_new_templates/Makefile
index b91f011fce..3bbcbf8728 100644
--- a/src/data/settings/tracker_new_templates/Makefile
+++ b/src/data/settings/tracker_new_templates/Makefile
@@ -1,45 +1,48 @@
-## Haiku Generic Makefile v2.6 ##
+## 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.
+##
+## For more information, see:
+## file:///system/develop/documentation/makefile-engine.html
# The name of the binary.
-NAME =
+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 =
+TYPE =
-# If you plan to use localization, specify the application's MIME
signature.
-APP_MIME_SIG =
+# 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->@
+# @src->@
-# Specify the source files to use. Full paths or paths relative to the
+# 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 =
+SRCS =
# Specify the resource definition files to use. Full or relative paths
can be
# used.
-RDEFS =
+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 =
+RSRCS =
# End Pe/Eddie support.
-# @<-src@
+# @<-src@
#%}
# Specify libraries to link against.
@@ -54,65 +57,65 @@ RSRCS =
# - 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 =
+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 =
+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 =
+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 =
+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 :=
+# SOME (O1), FULL (O3), 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 =
+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 =
+DEFINES =
# Specify the warning level. Either NONE (suppress all warnings),
# ALL (enable all warnings), or leave blank (enable default warnings).
-WARNINGS =
+WARNINGS =
# With image symbols, stack crawls in the debugger are meaningful.
# If set to "TRUE", symbols will be created.
-SYMBOLS :=
+SYMBOLS :=
# Includes debug information, which allows the binary to be debugged
easily.
# If set to "TRUE", debug info will be created.
-DEBUGGER :=
+DEBUGGER :=
# Specify any additional compiler flags to be used.
-COMPILER_FLAGS =
+COMPILER_FLAGS =
# Specify any additional linker flags to be used.
-LINKER_FLAGS =
+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 :=
+APP_VERSION :=
# (Only used when "TYPE" is "DRIVER"). Specify the desired driver install
# location in the /dev hierarchy. Example:
@@ -120,7 +123,7 @@ APP_VERSION :=
# 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 =
+DRIVER_PATH =
## Include the Makefile-Engine
DEVEL_DIRECTORY := \
