Merge lp:~mue-comnets/openwns-sdk/buildsupport-removed into lp:openwns-sdk

[Maciej Muehleisen]

[Maciej Muehleisen (mue-comnets)]

Removed buildsupport from projects.py and playground Update.
Adjusted CreateModul to remove common.py using the old buildsupport.
Test are running and CreateModule still works. Created a new module and compiled it successfully.

config/common.py should be removed from all projects

[lp:~mue-comnets/openwns-sdk/buildsupport-removed]

154. By Maciej Muehleisen on 2009-03-20

Moved FilePatcher to wnsbase, adjusted CreateModule and setupKDevelop, removed memcheck.py from bin

[Maciej Muehleisen (mue-comnets)]

In rev. 154 I moved FilePatcher to wnsbase. It is needed by bin/setupKDevelop and CreteModule.

Unmerged revisions

154. By Maciej Muehleisen on 2009-03-20

Moved FilePatcher to wnsbase, adjusted CreateModule and setupKDevelop, removed memcheck.py from bin

153. By Maciej Muehleisen on 2009-03-19

Removed patching of common.py from moduleTemplate

152. By Maciej Muehleisen on 2009-03-19

Removed common.py from moduleTemplate

=== modified file 'config/projects.py.template'
--- config/projects.py.template	2009-02-10 10:52:23 +0000
+++ config/projects.py.template	2009-03-19 13:51:25 +0000
@@ -39,12 +39,6 @@
                 RCS.Bazaar('./tests/unit', 
                     'unittest', 'main', '1.0'))
 
-buildSupport = Generic('./framework/buildSupport',
-                "openwns-buildsupport/buildsupport--main--1.0", 
-                bzrBaseURL,
-                RCS.Bazaar('./framework/buildSupport', 
-                    'buildsupport', 'main', '1.0'))
-
 documentation = MasterDocumentation('./documentation', 
                 'openwns-documentation/documentation--main--1.0', 
                 bzrBaseURL,
@@ -149,7 +143,6 @@
 all = [
     root,
     unitTests,
-    buildSupport,
     documentation,
     library,
     application,
 
=== modified file 'wnsbase/playground/builtins/CreateModule/CreateModule.py'
--- wnsbase/playground/builtins/CreateModule/CreateModule.py	2009-02-24 17:16:42 +0000
+++ wnsbase/playground/builtins/CreateModule/CreateModule.py	2009-03-19 14:00:06 +0000
@@ -133,14 +133,6 @@
 
         p = FilePatcher.FilePatcher(os.path.join(dest, "MAINTAINER"), "John Doe <[e-mail]>", maintainer).replaceAll()
 
-        p = FilePatcher.FilePatcher(os.path.join(dest, "config", "common.py"),
-                                    "PROJNAME       = 'projname',",
-                                    "PROJNAME       = '%s'," % moduleName.lower()).replaceAll()
-
-        p = FilePatcher.FilePatcher(os.path.join(dest, "config", "common.py"),
-                                    "RCS.Bazaar\('../', 'ModuleTemplate', 'main', '1.0'\),",
-                                    "RCS.Bazaar('../', '%s', '%s', '%s')," % (moduleName, 'deprecated', 'deprecated')).replaceAll()
-
         filesToPatch = [os.path.join(dest, "config", "libfiles.py"),
                         os.path.join(dest, "src", "ProjNameModule.hpp"),
                         os.path.join(dest, "src", "ProjNameModule.cpp"),
 
=== removed file 'wnsbase/playground/builtins/CreateModule/moduleTemplate/config/common.py'
--- wnsbase/playground/builtins/CreateModule/moduleTemplate/config/common.py	2008-08-21 15:45:19 +0000
+++ wnsbase/playground/builtins/CreateModule/moduleTemplate/config/common.py	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-import os
-import CNBuildSupport
-from CNBuildSupport import CNBSEnvironment
-import wnsbase.RCS as RCS
-
-commonEnv = CNBSEnvironment(PROJNAME       = 'projname',
-                            AUTODEPS       = ['wns'],
-                            PROJMODULES    = ['TEST', 'BASE'],
-                            LIBRARY        = True,
-                            SHORTCUTS      = True,
-                            FLATINCLUDES   = False,
-			    REVISIONCONTROL = RCS.Bazaar('../', 'ModuleTemplate', 'main', '1.0'), 
-                            )
-Return('commonEnv')
 
=== modified file 'wnsbase/playground/builtins/Update/Update.py'
--- wnsbase/playground/builtins/Update/Update.py	2009-02-03 18:08:44 +0000
+++ wnsbase/playground/builtins/Update/Update.py	2009-03-19 13:51:25 +0000
@@ -41,10 +41,8 @@
 
         usage += """
 
-Updates the following projects and rereads the project configuration
-afterwards:
-  1. openWNS--main--1.0  : Master located at ./
-  2. cn-scons--main--1.0 : Build support located at ./framework/cn-scons--main--1.0
+Updates the SDK and rereads the project configuration
+afterwards
 """
         wnsbase.playground.plugins.Command.Command.__init__(self, "update", rationale, usage)
 
@@ -72,22 +70,5 @@
         else:
             print "None"
 
-        sys.stdout.write("Checking for new patches in: %s ... " % ("./framework/buildSupport"))
-        sys.stdout.flush()
-        missing = str(projects.buildSupport.getRCS().missing(projects.buildSupport.getRCSUrl(), {"-s":""}))
-        if(missing != ""):
-            print "Found:"
-            print missing
-            checkForConflictsAndExit("./framework/buildSupport")
-            print "\nRetrieving new patches for './framework/buildSupport/' ..."
-            try:
-                projects.buildSupport.getRCS().update(projects.buildSupport.getRCSUrl()).realtimePrint()
-                checkForConflictsAndExit("./framework/buildSupport")
-            except wnsbase.rcs.Bazaar.BzrMergeNeededException, e:
-                if (not core.userFeedback.askForReject("These branches have diverged! Do you want me to merge?")):
-                    projects.buildSupport.getRCS().merge(fromRepository=projects.buildSupport.getRCSUrl()).realtimePrint()
-        else:
-            print "None"
-
         # Maybe projects.py has changed. Trigger reload
         core.readProjectsConfig(core.projectsFile)