gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed extracting list of classes from frameworks when a class name contains numbers (eg, testFramework1)

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@31036 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2010-07-26 14:02:29 +00:00
parent 1b588bbb1c
commit 8513fe919c
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-07-26 Nicola Pero <nicola.pero@meta-innovation.com>
* target.make (EXTRACT_CLASS_NAMES_COMMAND): Allow numbers in
class names. Otherwise, class names containing numbers would not
be recognized and not appear in the list of framework classes.
2010-07-16 Nicola Pero <nicola.pero@meta-innovation.com>
* common.make: Set INTERNAL_OBJCFLAGS, not OBJCFLAGS, so that

6
target.make
View file

@ -139,11 +139,11 @@ endif
#
# The 'sed' command parses a set of lines, and extracts lines starting
# with __objc_class_name_XXXX Y, where XXXX is a string of characters
# from A-Za-z_. and Y is not 'U'. It then replaces the whole line
# from A-Za-z0-9_. and Y is not 'U'. It then replaces the whole line
# with XXXX, and prints the result. '-n' disables automatic printing
# for portability, so we are sure we only print what we want on all
# platforms.
EXTRACT_CLASS_NAMES_COMMAND = nm -Pg $$object_file | sed -n -e '/^__objc_class_name_[A-Za-z_.]* [^U]/ {s/^__objc_class_name_\([A-Za-z_.]*\) [^U].*/\1/p;}'
EXTRACT_CLASS_NAMES_COMMAND = nm -Pg $$object_file | sed -n -e '/^__objc_class_name_[A-Za-z0-9_.]* [^U]/ {s/^__objc_class_name_\([A-Za-z0-9_.]*\) [^U].*/\1/p;}'
#
# This is the generic version - if the target is not in the following list,
@ -911,7 +911,7 @@ ADDITIONAL_LDFLAGS += -Wl,--enable-auto-import
# On Mingw32, it looks like the class name symbols start with '___' rather
# than '__'
EXTRACT_CLASS_NAMES_COMMAND = nm -Pg $$object_file | sed -n -e '/^___objc_class_name_[A-Za-z_.]* [^U]/ {s/^___objc_class_name_\([A-Za-z_.]*\) [^U].*/\1/p;}'
EXTRACT_CLASS_NAMES_COMMAND = nm -Pg $$object_file | sed -n -e '/^___objc_class_name_[A-Za-z0-9_.]* [^U]/ {s/^___objc_class_name_\([A-Za-z0-9_.]*\) [^U].*/\1/p;}'
endif