diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-08 20:39:38 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-08 20:39:38 +0000 |
commit | 6228e333d2decc12fc2cdb33cbd7b64cdc684ccb (patch) | |
tree | 619671d3685c853aa747282def3fb102d47745e6 /dev-util/confix/files | |
parent | Fix dependencies. Set SUPPORT_PYTHON_ABIS (bug #324397). (diff) | |
download | gentoo-2-6228e333d2decc12fc2cdb33cbd7b64cdc684ccb.tar.gz gentoo-2-6228e333d2decc12fc2cdb33cbd7b64cdc684ccb.tar.bz2 gentoo-2-6228e333d2decc12fc2cdb33cbd7b64cdc684ccb.zip |
Delete older ebuilds.
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/confix/files')
-rw-r--r-- | dev-util/confix/files/2.1.0/CALL_RESCAN_HACK.patch | 37 | ||||
-rw-r--r-- | dev-util/confix/files/2.1.0/exeext.patch | 20 | ||||
-rw-r--r-- | dev-util/confix/files/2.1.0/ext-ac-archive.patch | 30 | ||||
-rw-r--r-- | dev-util/confix/files/2.1.0/fast-install.patch | 310 | ||||
-rw-r--r-- | dev-util/confix/files/2.1.0/local-libs-first.patch | 38 | ||||
-rw-r--r-- | dev-util/confix/files/2.1.0/private-headers.patch | 37 |
6 files changed, 0 insertions, 472 deletions
diff --git a/dev-util/confix/files/2.1.0/CALL_RESCAN_HACK.patch b/dev-util/confix/files/2.1.0/CALL_RESCAN_HACK.patch deleted file mode 100644 index beac44f32862..000000000000 --- a/dev-util/confix/files/2.1.0/CALL_RESCAN_HACK.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ruN Confix-2.1.0.orig/libconfix/core/filesys/directory.py Confix-2.1.0/libconfix/core/filesys/directory.py ---- Confix-2.1.0.orig/libconfix/core/filesys/directory.py 2007-08-10 11:56:15.259323000 +0200 -+++ Confix-2.1.0/libconfix/core/filesys/directory.py 2007-08-10 11:59:35.163484000 +0200 -@@ -68,8 +68,8 @@ - def add(self, name, entry): - assert isinstance(entry, DirectoryEntry) - assert entry.filesystem() is None or entry.filesystem() is self.filesystem() -- if self.entry_by_name_.has_key(name): -- raise Directory.AlreadyMounted(name=name, dir=self) -+ #if self.entry_by_name_.has_key(name): -+ #raise Directory.AlreadyMounted(name=name, dir=self) - self.entry_by_name_[name] = entry - self.name_by_entry_[entry] = name - entry.set_parent(self) -diff -ruN Confix-2.1.0.orig/libconfix/core/filesys/scan.py Confix-2.1.0/libconfix/core/filesys/scan.py ---- Confix-2.1.0.orig/libconfix/core/filesys/scan.py 2007-08-10 11:56:15.199323000 +0200 -+++ Confix-2.1.0/libconfix/core/filesys/scan.py 2007-08-10 11:59:35.173484000 +0200 -@@ -52,19 +52,6 @@ - if name in ['.', '..']: - continue - absname = os.path.join(abspath, name) -- existing_entry = dir.get(name) -- # <paranoia> -- if existing_entry is not None: -- if os.path.isfile(absname): -- if not isinstance(existing_entry, File): -- raise Error('Cannot convert existing entry '+name+' to a file') -- continue -- if os.path.isdir(absname): -- if not isinstance(existing_entry, Directory): -- raise Error('Cannot convert existing entry '+name+' to a directory') -- continue -- raise Error(absname+' has unknown type') -- # </paranoia> - - # go add the new entry - if os.path.isfile(absname): diff --git a/dev-util/confix/files/2.1.0/exeext.patch b/dev-util/confix/files/2.1.0/exeext.patch deleted file mode 100644 index 9378883f8b38..000000000000 --- a/dev-util/confix/files/2.1.0/exeext.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rubB Confix-2.1.0.orig/libconfix/core/automake/makefile_am.py Confix-2.1.0/libconfix/core/automake/makefile_am.py ---- Confix-2.1.0.orig/libconfix/core/automake/makefile_am.py Tue Oct 9 13:50:28 2007 -+++ Confix-2.1.0/libconfix/core/automake/makefile_am.py Tue Oct 9 14:09:47 2007 -@@ -469,7 +469,15 @@ - - # register automatic tests and set their environment - -- tests = self.dir_primary('check', 'PROGRAMS') + \ -+ test_tmp = self.dir_primary('check', 'PROGRAMS') -+ count = 0 -+ for prog in test_tmp: -+ prog += "$(EXEEXT)" -+ test_tmp[count] = prog -+ count += 1 -+ pass -+ -+ tests = test_tmp + \ - self.dir_primary('check', 'SCRIPTS') - if len(tests): - lines.extend(List(name='TESTS', values=tests, mitigate=True).lines()) diff --git a/dev-util/confix/files/2.1.0/ext-ac-archive.patch b/dev-util/confix/files/2.1.0/ext-ac-archive.patch deleted file mode 100644 index e01fc08c2fb1..000000000000 --- a/dev-util/confix/files/2.1.0/ext-ac-archive.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- libconfix/core/automake/bootstrap.py.orig 2008-04-08 09:37:29.000000000 +0200 -+++ libconfix/core/automake/bootstrap.py 2008-04-08 09:37:44.000000000 +0200 -@@ -23,12 +23,12 @@ - from libconfix.core.utils import helper - from libconfix.core.utils import debug - --import autoconf_archive -+#import autoconf_archive - import kde_hack - - def bootstrap(packageroot, use_libtool, use_kde_hack, argv0, path=None): - aclocal_incdirs = [] -- aclocal_incdirs.append(autoconf_archive.include_path(argv0)) -+# aclocal_incdirs.append(autoconf_archive.include_path(argv0)) - - if use_libtool: - libtoolize_prog = external_cmd.search_program('libtoolize', path) ---- setup.py.orig 2008-04-08 09:40:11.000000000 +0200 -+++ setup.py 2008-04-08 09:39:09.000000000 +0200 -@@ -41,8 +41,8 @@ - return result - - datafiles = [] --datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', [])) --datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', [])) -+#datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', [])) -+#datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', [])) - - # scripts to put in the auxdir. - datafiles.extend([('share/confix/kde-hack', diff --git a/dev-util/confix/files/2.1.0/fast-install.patch b/dev-util/confix/files/2.1.0/fast-install.patch deleted file mode 100644 index 0c3778ae7f73..000000000000 --- a/dev-util/confix/files/2.1.0/fast-install.patch +++ /dev/null @@ -1,310 +0,0 @@ -diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.0/libconfix/core/automake/file_installer.py ---- Confix-2.1.0.orig/libconfix/core/automake/file_installer.py 2008-10-21 11:17:30 +0200 -+++ Confix-2.1.0/libconfix/core/automake/file_installer.py 2009-01-26 15:02:50 +0100 -@@ -22,6 +22,11 @@ - from libconfix.core.utils.paragraph import Paragraph - from libconfix.core.utils import const - -+try: -+ from hashlib import md5 as my_md5 -+except ImportError: -+ from md5 import new as my_md5 -+ - import helper_automake - from rule import Rule - -@@ -55,10 +60,17 @@ - ## FILENAME_BULK_INSTALL_PUBLIC = '.bulk-install-public' - ## FILENAME_BULK_INSTALL_LOCAL = '.bulk-install-local' - --## TARGET_INSTALL_PUBLIC = 'confix-install-public' -+ TARGET_INSTALL_PUBLIC = 'confix-install-public' -+ TARGET_INSTALL_DATA_PUBLIC = 'confix-install-data-public' -+ TARGET_INSTALL_PREFIX_PUBLIC = 'confix-install-prefix-public' -+ TARGET_UNINSTALL_PUBLIC = 'confix-uninstall-public' -+ TARGET_UNINSTALL_DATA_PUBLIC = 'confix-uninstall-data-public' -+ TARGET_UNINSTALL_PREFIX_PUBLIC = 'confix-uninstall-prefix-public' - TARGET_INSTALL_LOCAL = 'confix-install-local' - TARGET_CLEAN_LOCAL = 'confix-clean-local' - -+ MAX_SIMULTANOUS_INSTALL = 20 -+ - ## VAR_SRCDIR = 'srcdir' - ## VAR_BUILDDIR = 'builddir' - ## VAR_INCLUDEDIR = 'includedir' -@@ -190,10 +202,13 @@ - ## buildmod.makefile_am().add_lines(['if !BULK_INSTALL', '']) - ## pass - -- self.automake_install_public_headers_(makefile_am=makefile_am) -- self.automake_install_datafiles_(makefile_am=makefile_am) -- self.automake_install_prefixfiles_(makefile_am=makefile_am) -- self.automake_install_private_headers_(makefile_am=makefile_am) -+ #self.automake_install_public_headers_(makefile_am=makefile_am) -+ #self.automake_install_datafiles_(makefile_am=makefile_am) -+ #self.automake_install_prefixfiles_(makefile_am=makefile_am) -+ self.fast_install_public_headers_(makefile_am=makefile_am) -+ self.fast_install_datafiles_(makefile_am=makefile_am) -+ self.fast_install_prefixfiles_(makefile_am=makefile_am) -+ self.fast_install_private_headers_(makefile_am=makefile_am) - ## buildmod.makefile_am().add_lines(helper_automake.format_rule( - ## targets=[FileInstaller.TARGET_INSTALL_PUBLIC])) - -@@ -264,6 +279,56 @@ - files=filelist) - pass - pass -+ -+ def fast_install_public_headers_(self, makefile_am): -+ makefile_am.add_install_data_local(FileInstaller.TARGET_INSTALL_PUBLIC) -+ # this rule should be provided by makefile_am, much like the above install-data-local -+ makefile_am.add_element(Rule(targets=['uninstall-local'], prerequisites=[FileInstaller.TARGET_UNINSTALL_PUBLIC], commands=[])) -+ -+ install_public_rule = Rule(targets=[FileInstaller.TARGET_INSTALL_PUBLIC], prerequisites=[], commands=[]) -+ uninstall_public_rule = Rule(targets=[FileInstaller.TARGET_UNINSTALL_PUBLIC], prerequisites=[], commands=[]) -+ -+ makefile_am.add_element(install_public_rule) -+ makefile_am.add_element(uninstall_public_rule) -+ -+ dir2file_dict = self.dir2filedict_(self.public_headers_) -+ -+ for (installpath, files) in dir2file_dict.iteritems(): -+ if len(installpath): -+ targetdir = '/'.join(['$(includedir)', installpath]) -+ -+ # define symbol for backwards compatability in handwritten rules. -+ symbolicname = self.compute_install_dirname_('publicheader_'+installpath) -+ makefile_am.define_install_directory(symbolicname=symbolicname, -+ dirname='$(includedir)/'+installpath) -+ else: -+ targetdir = '$(includedir)' -+ pass -+ -+ # add mkdir rules for every subdirectory -+ makefile_am.add_element( -+ Rule(targets=[targetdir], -+ prerequisites=[], -+ commands=['-$(mkinstalldirs) '+targetdir])) -+ -+ _i=0 -+ _f=[] -+ for f in files: -+ makefile_am.add_extra_dist(f) -+ _f.append(f) -+ _i+=1 -+ if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files): -+ # is this rule name unique enough? -+ rulename='.installstamp.public_' + my_md5(str(hash(self)) + targetdir + str(_i)).hexdigest() -+ self.fast_general_install(makefile_am, rulename, '$(DESTDIR)' + targetdir, _f, '0644') -+ install_public_rule.add_prerequisite(rulename) -+ uninstall_public_rule.add_prerequisite(rulename + '_clean') -+ _f=[] -+ pass -+ pass -+ pass -+ pass -+ - - def automake_install_datafiles_(self, makefile_am): - for dirname, filelist in self.dir2filedict_(file2dirdict=self.datafiles_).iteritems(): -@@ -278,6 +343,51 @@ - pass - pass - -+ def fast_install_datafiles_(self, makefile_am): -+ makefile_am.add_install_data_local(FileInstaller.TARGET_INSTALL_DATA_PUBLIC) -+ # this rule should be provided by makefile_am, much like the above install-data-local -+ makefile_am.add_element(Rule(targets=['uninstall-local'], prerequisites=[FileInstaller.TARGET_UNINSTALL_DATA_PUBLIC], commands=[])) -+ -+ install_public_data_rule = Rule(targets=[FileInstaller.TARGET_INSTALL_DATA_PUBLIC], prerequisites=[], commands=[]) -+ uninstall_public_data_rule = Rule(targets=[FileInstaller.TARGET_UNINSTALL_DATA_PUBLIC], prerequisites=[], commands=[]) -+ -+ makefile_am.add_element(install_public_data_rule) -+ makefile_am.add_element(uninstall_public_data_rule) -+ -+ dir2file_dict = self.dir2filedict_(self.datafiles_) -+ -+ for (installpath, files) in dir2file_dict.iteritems(): -+ targetdir = '/'.join(['$(datadir)', installpath]) -+ -+ # define symbol for backwards compatability in handwritten rules. -+ symbolicname = self.compute_install_dirname_('data_'+installpath) -+ makefile_am.define_install_directory(symbolicname=symbolicname, -+ dirname='$(datadir)/'+installpath) -+ -+ # add mkdir rules for every subdirectory -+ makefile_am.add_element( -+ Rule(targets=[targetdir], -+ prerequisites=[], -+ commands=['-$(mkinstalldirs) '+targetdir])) -+ -+ _i=0 -+ _f=[] -+ for f in files: -+ makefile_am.add_extra_dist(f) -+ _f.append(f) -+ _i+=1 -+ if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files): -+ # is this rule name unique enough? -+ rulename='.installstamp.public_data_' + my_md5(str(hash(self)) + targetdir + str(_i)).hexdigest() -+ self.fast_general_install(makefile_am, rulename, '$(DESTDIR)' + targetdir, _f, '0644') -+ install_public_data_rule.add_prerequisite(rulename) -+ uninstall_public_data_rule.add_prerequisite(rulename + '_clean') -+ _f=[] -+ pass -+ pass -+ pass -+ pass -+ - def automake_install_prefixfiles_(self, makefile_am): - for dirname, filelist in self.dir2filedict_(file2dirdict=self.prefixfiles_).iteritems(): - # define directory -@@ -291,17 +401,92 @@ - pass - pass - -- def automake_install_private_headers_(self, makefile_am): -+ def fast_install_prefixfiles_(self, makefile_am): -+ makefile_am.add_install_data_local(FileInstaller.TARGET_INSTALL_PREFIX_PUBLIC) -+ # this rule should be provided by makefile_am, much like the above install-data-local -+ makefile_am.add_element(Rule(targets=['uninstall-local'], prerequisites=[FileInstaller.TARGET_UNINSTALL_PREFIX_PUBLIC], commands=[])) -+ -+ install_public_prefix_rule = Rule(targets=[FileInstaller.TARGET_INSTALL_PREFIX_PUBLIC], prerequisites=[], commands=[]) -+ uninstall_public_prefix_rule = Rule(targets=[FileInstaller.TARGET_UNINSTALL_PREFIX_PUBLIC], prerequisites=[], commands=[]) -+ -+ makefile_am.add_element(install_public_prefix_rule) -+ makefile_am.add_element(uninstall_public_prefix_rule) -+ -+ dir2file_dict = self.dir2filedict_(self.prefixfiles_) -+ -+ for (installpath, files) in dir2file_dict.iteritems(): -+ targetdir = '/'.join(['$(prefix)', installpath]) -+ -+ # define symbol for backwards compatability in handwritten rules. -+ symbolicname = self.compute_install_dirname_('prefix_'+installpath) -+ makefile_am.define_install_directory(symbolicname=symbolicname, -+ dirname='$(prefix)/'+installpath) -+ -+ # add mkdir rules for every subdirectory -+ makefile_am.add_element( -+ Rule(targets=[targetdir], -+ prerequisites=[], -+ commands=['-$(mkinstalldirs) '+targetdir])) -+ -+ _i=0 -+ _f=[] -+ for f in files: -+ makefile_am.add_extra_dist(f) -+ _f.append(f) -+ _i+=1 -+ if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files): -+ # is this rule name unique enough? -+ rulename='.installstamp.public_prefix_' + my_md5(str(hash(self)) + targetdir + str(_i)).hexdigest() -+ self.fast_general_install(makefile_am, rulename, '$(DESTDIR)' + targetdir, _f, '0644') -+ install_public_prefix_rule.add_prerequisite(rulename) -+ uninstall_public_prefix_rule.add_prerequisite(rulename + '_clean') -+ _f=[] -+ pass -+ pass -+ pass -+ pass -+ -+ -+ -+ def fast_general_install(self, makefile_am, rulename, targetdir, files, mode): -+ # WARNING: be _very_ carefull about what you change -+ # below, since this is a double-loop, one for'ing over -+ # all paths, and one shift'ing over all basenames. If -+ # for some reason those run apart, files may be copied -+ # to wrong destination names! -+ makefile_am.add_element( -+ Rule(targets=[rulename], -+ prerequisites=[' '.join(files)], -+ commands=['-@$(mkinstalldirs) ' + targetdir, -+ '@test -z "$?" && exit 0; \\', -+ 'set dummy $(?F); \\', -+ 'for f in $?; do \\', -+ ' shift; \\', -+ ' bf=$${1}; \\', -+ ' echo "fast install $${f} -> ' + targetdir + '/$${bf}"; \\', -+ ' __f="$${__f} $${f}"; \\', -+ ' __tf="$${__tf} ' + targetdir + '/$${bf}"; \\', -+ 'done; \\', -+ 'test -z "$${__f}" && exit 0; \\', -+ 'cp -fp $${__f} ' + targetdir + ' || exit 1; \\', -+ 'chmod ' + mode + ' $${__tf} || exit 1;'])) -+ makefile_am.add_element( -+ Rule(targets=[rulename + '_clean'], -+ prerequisites=[], -+ commands=['rm -f ' + str(' ' + targetdir + '/').join([''] + files) + ';'])) -+ pass -+ -+ def fast_install_private_headers_(self, makefile_am): - - # now for the private header files. this is a bit more - # complicated as we have to do it by hand, using the all-local - # hook. - -- makefile_am.add_all_local('confix-install-local') -- makefile_am.add_clean_local('confix-clean-local') -+ makefile_am.add_all_local(FileInstaller.TARGET_INSTALL_LOCAL) -+ makefile_am.add_clean_local(FileInstaller.TARGET_CLEAN_LOCAL) - -- install_local_rule = Rule(targets=['confix-install-local'], prerequisites=[], commands=[]) -- clean_local_rule = Rule(targets=['confix-clean-local'], prerequisites=[], commands=[]) -+ install_local_rule = Rule(targets=[FileInstaller.TARGET_INSTALL_LOCAL], prerequisites=[], commands=[]) -+ clean_local_rule = Rule(targets=[FileInstaller.TARGET_CLEAN_LOCAL], prerequisites=[], commands=[]) - makefile_am.add_element(install_local_rule) - makefile_am.add_element(clean_local_rule) - -@@ -321,20 +506,37 @@ - commands=['-$(mkinstalldirs) '+targetdir])) - - # copy files -+# for f in files: -+# targetfile = '/'.join([targetdir, f]) -+# makefile_am.add_element( -+# Rule(targets=[targetfile], -+# prerequisites=[f], -+# commands=['-@$(mkinstalldirs) '+targetdir, -+# 'cp -fp $? '+' '+targetdir, -+# 'chmod 0444 '+targetfile])) -+# makefile_am.add_element( -+# Rule(targets=[targetfile+'-clean'], -+# prerequisites=[], -+# commands=['rm -f '+targetfile])) -+# install_local_rule.add_prerequisite(targetfile) -+# clean_local_rule.add_prerequisite(targetfile+'-clean') -+# pass -+# pass -+ -+ _i=0 -+ _f=[] - for f in files: -- targetfile = '/'.join([targetdir, f]) -- makefile_am.add_element( -- Rule(targets=[targetfile], -- prerequisites=[f], -- commands=['-@$(mkinstalldirs) '+targetdir, -- 'cp -fp $? '+' '+targetdir, -- 'chmod 0444 '+targetfile])) -- makefile_am.add_element( -- Rule(targets=[targetfile+'-clean'], -- prerequisites=[], -- commands=['rm -f '+targetfile])) -- install_local_rule.add_prerequisite(targetfile) -- clean_local_rule.add_prerequisite(targetfile+'-clean') -+ makefile_am.add_extra_dist(f) -+ _f.append(f) -+ _i+=1 -+ if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files): -+ # is this rule name unique enough? -+ rulename='.installstamp.private_' + my_md5(str(hash(self)) + targetdir + str(_i)).hexdigest() -+ self.fast_general_install(makefile_am, rulename, targetdir, _f, '0444') -+ install_local_rule.add_prerequisite(rulename) -+ clean_local_rule.add_prerequisite(rulename + '_clean') -+ _f=[] -+ pass - pass - pass - pass diff --git a/dev-util/confix/files/2.1.0/local-libs-first.patch b/dev-util/confix/files/2.1.0/local-libs-first.patch deleted file mode 100644 index 26f9c754dde5..000000000000 --- a/dev-util/confix/files/2.1.0/local-libs-first.patch +++ /dev/null @@ -1,38 +0,0 @@ -With libtool, link local libraries with /path/to/libfile.la instead of libpath, -to avoid encoding local libpath into installed la-file. -These also have to be linked first, to avoid finding already installed -libraries of previous versions during libtool-relink. ---- libconfix/plugins/c/linked.py.orig 2010-06-25 11:30:40.885595798 +0200 -+++ libconfix/plugins/c/linked.py 2010-06-25 11:31:07.055184455 +0200 -@@ -128,6 +128,8 @@ - pass - - def get_linkline(self): -+ local_paths = [] -+ local_libraries = [] - native_paths = [] - native_libraries = [] - external_linkline = [] -@@ -150,8 +152,11 @@ - - for bi in native_libs_to_use: - if isinstance(bi, BuildInfo_CLibrary_NativeLocal): -- native_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir())) -- native_libraries.append('-l'+bi.name()) -+ if self.__use_libtool: -+ local_libraries.append('/'.join(['$(top_builddir)']+bi.dir()+['lib'+bi.name()+'.la'])) -+ else: -+ local_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir())) -+ local_libraries.append('-l'+bi.name()) - continue - if isinstance(bi, BuildInfo_CLibrary_NativeInstalled): - using_installed_library = True -@@ -173,7 +178,7 @@ - external_linkline.extend(elem) - pass - -- return native_paths + native_libraries + external_linkline -+ return local_paths + local_libraries + native_paths + native_libraries + external_linkline - - def __init_buildinfo(self): - self.__buildinfo_direct_dependent_native_libs = [] diff --git a/dev-util/confix/files/2.1.0/private-headers.patch b/dev-util/confix/files/2.1.0/private-headers.patch deleted file mode 100644 index ffe1aec5d854..000000000000 --- a/dev-util/confix/files/2.1.0/private-headers.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ru Confix-2.1.0.orig/libconfix/plugins/c/h.py Confix-2.1.0/libconfix/plugins/c/h.py ---- Confix-2.1.0.orig/libconfix/plugins/c/h.py 2008-10-17 10:37:57 +0200 -+++ Confix-2.1.0/libconfix/plugins/c/h.py 2008-10-17 10:39:38 +0200 -@@ -31,6 +31,7 @@ - - class HeaderBuilder(CBaseBuilder): - PROPERTY_INSTALLPATH = 'INSTALLPATH_CINCLUDE' -+ PROPERTY_PRIVATE = 'PRIVATE_CINCLUDE' - - class AmbiguousVisibility(Error): - def __init__(self, header_builder, cur, prev): -@@ -56,6 +57,7 @@ - self.__namespace_install_path = None - self.__namespace_error = None - self.__property_install_path = None -+ self.__property_private = None - self.__iface_install_path = None - self.__external_install_path = None - -@@ -75,6 +77,7 @@ - - if self.file() is not None: - self.__property_install_path = self.file().get_property(HeaderBuilder.PROPERTY_INSTALLPATH) -+ self.__property_private = self.file().get_property(HeaderBuilder.PROPERTY_PRIVATE) - pass - try: - self.__namespace_install_path = namespace.find_unique_namespace(self.file().lines()) -@@ -129,7 +132,8 @@ - def output(self): - super(HeaderBuilder, self).output() - installdir = self.visible_in_directory() -- self.parentbuilder().file_installer().add_public_header(filename=self.file().name(), dir=installdir) -+ if self.__property_private is None: -+ self.parentbuilder().file_installer().add_public_header(filename=self.file().name(), dir=installdir) - self.parentbuilder().file_installer().add_private_header(filename=self.file().name(), dir=installdir) - pass - |