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

Proposed by Maciej Muehleisen on 2009-03-19
Status: Needs review
Proposed branch: lp:~mue-comnets/openwns-sdk/buildsupport-removed
Merge into: lp:openwns-sdk
Diff against target: None lines
To merge this branch: bzr merge lp:~mue-comnets/openwns-sdk/buildsupport-removed
Reviewer Review Type Date Requested Status
ComNets, RWTH Aachen, University 2009-03-19 Pending
Review via email: mp+4666@code.launchpad.net
To post a comment you must log in.
Maciej Muehleisen (mue-comnets) wrote :

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

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config/projects.py.template'
2--- config/projects.py.template 2009-02-10 10:52:23 +0000
3+++ config/projects.py.template 2009-03-19 13:51:25 +0000
4@@ -39,12 +39,6 @@
5 RCS.Bazaar('./tests/unit',
6 'unittest', 'main', '1.0'))
7
8-buildSupport = Generic('./framework/buildSupport',
9- "openwns-buildsupport/buildsupport--main--1.0",
10- bzrBaseURL,
11- RCS.Bazaar('./framework/buildSupport',
12- 'buildsupport', 'main', '1.0'))
13-
14 documentation = MasterDocumentation('./documentation',
15 'openwns-documentation/documentation--main--1.0',
16 bzrBaseURL,
17@@ -149,7 +143,6 @@
18 all = [
19 root,
20 unitTests,
21- buildSupport,
22 documentation,
23 library,
24 application,
25
26=== modified file 'wnsbase/playground/builtins/CreateModule/CreateModule.py'
27--- wnsbase/playground/builtins/CreateModule/CreateModule.py 2009-02-24 17:16:42 +0000
28+++ wnsbase/playground/builtins/CreateModule/CreateModule.py 2009-03-19 14:00:06 +0000
29@@ -133,14 +133,6 @@
30
31 p = FilePatcher.FilePatcher(os.path.join(dest, "MAINTAINER"), "John Doe <jdoe@doh.no>", maintainer).replaceAll()
32
33- p = FilePatcher.FilePatcher(os.path.join(dest, "config", "common.py"),
34- "PROJNAME = 'projname',",
35- "PROJNAME = '%s'," % moduleName.lower()).replaceAll()
36-
37- p = FilePatcher.FilePatcher(os.path.join(dest, "config", "common.py"),
38- "RCS.Bazaar\('../', 'ModuleTemplate', 'main', '1.0'\),",
39- "RCS.Bazaar('../', '%s', '%s', '%s')," % (moduleName, 'deprecated', 'deprecated')).replaceAll()
40-
41 filesToPatch = [os.path.join(dest, "config", "libfiles.py"),
42 os.path.join(dest, "src", "ProjNameModule.hpp"),
43 os.path.join(dest, "src", "ProjNameModule.cpp"),
44
45=== removed file 'wnsbase/playground/builtins/CreateModule/moduleTemplate/config/common.py'
46--- wnsbase/playground/builtins/CreateModule/moduleTemplate/config/common.py 2008-08-21 15:45:19 +0000
47+++ wnsbase/playground/builtins/CreateModule/moduleTemplate/config/common.py 1970-01-01 00:00:00 +0000
48@@ -1,14 +0,0 @@
49-import os
50-import CNBuildSupport
51-from CNBuildSupport import CNBSEnvironment
52-import wnsbase.RCS as RCS
53-
54-commonEnv = CNBSEnvironment(PROJNAME = 'projname',
55- AUTODEPS = ['wns'],
56- PROJMODULES = ['TEST', 'BASE'],
57- LIBRARY = True,
58- SHORTCUTS = True,
59- FLATINCLUDES = False,
60- REVISIONCONTROL = RCS.Bazaar('../', 'ModuleTemplate', 'main', '1.0'),
61- )
62-Return('commonEnv')
63
64=== modified file 'wnsbase/playground/builtins/Update/Update.py'
65--- wnsbase/playground/builtins/Update/Update.py 2009-02-03 18:08:44 +0000
66+++ wnsbase/playground/builtins/Update/Update.py 2009-03-19 13:51:25 +0000
67@@ -41,10 +41,8 @@
68
69 usage += """
70
71-Updates the following projects and rereads the project configuration
72-afterwards:
73- 1. openWNS--main--1.0 : Master located at ./
74- 2. cn-scons--main--1.0 : Build support located at ./framework/cn-scons--main--1.0
75+Updates the SDK and rereads the project configuration
76+afterwards
77 """
78 wnsbase.playground.plugins.Command.Command.__init__(self, "update", rationale, usage)
79
80@@ -72,22 +70,5 @@
81 else:
82 print "None"
83
84- sys.stdout.write("Checking for new patches in: %s ... " % ("./framework/buildSupport"))
85- sys.stdout.flush()
86- missing = str(projects.buildSupport.getRCS().missing(projects.buildSupport.getRCSUrl(), {"-s":""}))
87- if(missing != ""):
88- print "Found:"
89- print missing
90- checkForConflictsAndExit("./framework/buildSupport")
91- print "\nRetrieving new patches for './framework/buildSupport/' ..."
92- try:
93- projects.buildSupport.getRCS().update(projects.buildSupport.getRCSUrl()).realtimePrint()
94- checkForConflictsAndExit("./framework/buildSupport")
95- except wnsbase.rcs.Bazaar.BzrMergeNeededException, e:
96- if (not core.userFeedback.askForReject("These branches have diverged! Do you want me to merge?")):
97- projects.buildSupport.getRCS().merge(fromRepository=projects.buildSupport.getRCSUrl()).realtimePrint()
98- else:
99- print "None"
100-
101 # Maybe projects.py has changed. Trigger reload
102 core.readProjectsConfig(core.projectsFile)

Subscribers

People subscribed via source and target branches