forward installFiles option; debian folder is no longer persistent

diff --git a/build_system.py b/build_system.py
index 39bbae7fb414646f2a9e9091e49002849b3830f2..6e72e71e9b8eed6713bc5a3a789133f5a9deee6a 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -53,6 +53,7 @@ try:
                        self.copyOption(config, 'jobs', 'parallelJobs')
                        self.copyOption(module, 'dbgPackage')
                        self.copyOption(module, 'skipFiles', 'binarySkipFiles')
                        self.copyOption(config, 'jobs', 'parallelJobs')
                        self.copyOption(module, 'dbgPackage')
                        self.copyOption(module, 'skipFiles', 'binarySkipFiles')

+                       self.copyOption(module, 'installFiles', 'binaryInstall')

                        self.copyOption(module, 'buildDepends')
                        self.copyOption(module, 'binaryDepends')
                        self.copyOption(module, 'binaryRecommends')
                        self.copyOption(module, 'buildDepends')
                        self.copyOption(module, 'binaryDepends')
                        self.copyOption(module, 'binaryRecommends')


@@ -70,7 +71,6 @@ try:
                        self.autoDebuildConfig['version'] = self.vcs.version() # by now, data has been fetched, so this is possible
                        if self.autoDebuildConfig['version'] is None:
                                raise Exception("VCS did not provide us with a proper version, please fix this")
                        self.autoDebuildConfig['version'] = self.vcs.version() # by now, data has been fetched, so this is possible
                        if self.autoDebuildConfig['version'] is None:
                                raise Exception("VCS did not provide us with a proper version, please fix this")

-                       self.vcs.ignore('/debian/') # make sure the debian folder is ignored

                        os.chdir(self.sourceFolder)
                        #print self.autoDebuildConfig
                        self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig)
                        os.chdir(self.sourceFolder)
                        #print self.autoDebuildConfig
                        self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig)

diff --git a/vcs.py b/vcs.py
index 9c91e933654d0326f2c06d31f8a1be0f4a8a4600..f7a99c10d006557918a17e4f6497e463cb5a0d10 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -52,13 +52,6 @@ class Git:
                if v.startswith('v'): v = v[1:]
                return v
 
                if v.startswith('v'): v = v[1:]
                return v
 

-       def ignore(self, name):
-               with open(os.path.join(self.folder, '.git', 'info', 'exclude'), 'r+') as f:
-                       for line in f:
-                               line = line.replace('\n', '').replace('\r', '')
-                               if line == name: return # is already ignored
-                       print >>f, name # add ignore line
-

 class KDEGit(Git):
        def __init__(self, folder, name, commit):
                Git.__init__(self, folder, 'kde:'+name, commit)
 class KDEGit(Git):
        def __init__(self, folder, name, commit):
                Git.__init__(self, folder, 'kde:'+name, commit)


@@ -80,9 +73,6 @@ class SVN:
        def version(self):
                return self.versionName
 
        def version(self):
                return self.versionName
 

-       def ignore(self, name):
-               pass
-

 class KDESVN(SVN):
        def __init__(self, folder, svnPath, version):
                SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath, version)
 class KDESVN(SVN):
        def __init__(self, folder, svnPath, version):
                SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath, version)