You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/11/12 13:09:12 UTC
svn commit: r1034362 - in /subversion/trunk/build: generator/
generator/templates/ win32/
Author: rhuijben
Date: Fri Nov 12 12:09:11 2010
New Revision: 1034362
URL: http://svn.apache.org/viewvc?rev=1034362&view=rev
Log:
Move projects generated by the Windows build to the right locations. The
necessary changes in the python scripting to handle this also allowed moving
the remaining project templates .ezt files to the templates directory.
Please let me know if this patch breaks something for you.
* build/generator/build_locale.ezt
* build/generator/msvc_dsp.ezt
* build/generator/svn_locale.vcxproj.ezt
* build/generator/build_zlib.ezt
* build/generator/neon.dsp.ezt
* build/generator/serf.dsp.ezt
* build/generator/zlib.dsp.ezt
* build/generator/svn_config.vcproj.ezt
* build/generator/svn_config.vcxproj.ezt
* build/generator/msvc_dsw.ezt
* build/generator/svn_locale.vcproj.ezt
* build/generator/serf.vcxproj.ezt
* build/generator/neon.vcxproj.ezt
* build/generator/zlib.vcxproj.ezt
* build/generator/neon.vcproj.ezt
* build/generator/serf.vcproj.ezt
* build/generator/zlib.vcproj.ezt Moved to build/generator/templates/.
* build/win32/svn_config.dsp
* build/win32/svn_locale.dsp
Moved to build/generator/templates/ with extension .dsp.ezt.
* build/generator/gen_vcnet_vcproj.py
(write): Move svn_config and svn_locale output to the projects directory.
* build/generator/gen_msvc_dsp.py
(write): Generate svn_config and svn_locale projects from a .ezt file, just
like the Visual Studio 2002-2010 versions.
* build/generator/gen_win.py
(WinGeneratorBase::__init__): Generate all files in the projectfiles directory
instead of a few in build/win32.
* build/generator/templates/msvc_dsp.ezt
* build/generator/templates/build_locale.ezt
* build/generator/templates/build_zlib.ezt
* build/generator/templates/svn_locale.vcxproj.ezt
* build/generator/templates/svn_config.dsp.ezt
* build/generator/templates/neon.dsp.ezt
* build/generator/templates/serf.dsp.ezt
* build/generator/templates/msvc_dsw.ezt
* build/generator/templates/zlib.dsp.ezt
* build/generator/templates/svn_locale.vcproj.ezt
* build/generator/templates/neon.vcxproj.ezt
* build/generator/templates/serf.vcxproj.ezt
* build/generator/templates/zlib.vcxproj.ezt
* build/generator/templates/neon.vcproj.ezt
* build/generator/templates/serf.vcproj.ezt
* build/generator/templates/zlib.vcproj.ezt
* build/generator/templates/svn_locale.dsp.ezt
Moved here from their old locations
* build/generator/templates/svn_config.vcxproj.ezt
* build/generator/templates/svn_config.vcproj.ezt
Moved here. Fix relative path to .sql files
Added:
subversion/trunk/build/generator/templates/build_locale.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/build_locale.ezt
subversion/trunk/build/generator/templates/build_zlib.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/build_zlib.ezt
subversion/trunk/build/generator/templates/msvc_dsp.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/msvc_dsp.ezt
subversion/trunk/build/generator/templates/msvc_dsw.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/msvc_dsw.ezt
subversion/trunk/build/generator/templates/neon.dsp.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/neon.dsp.ezt
subversion/trunk/build/generator/templates/neon.vcproj.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/neon.vcproj.ezt
subversion/trunk/build/generator/templates/neon.vcxproj.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/neon.vcxproj.ezt
subversion/trunk/build/generator/templates/serf.dsp.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/serf.dsp.ezt
subversion/trunk/build/generator/templates/serf.vcproj.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/serf.vcproj.ezt
subversion/trunk/build/generator/templates/serf.vcxproj.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/serf.vcxproj.ezt
subversion/trunk/build/generator/templates/svn_config.dsp.ezt
- copied unchanged from r1034309, subversion/trunk/build/win32/svn_config.dsp
subversion/trunk/build/generator/templates/svn_config.vcproj.ezt
- copied, changed from r1034309, subversion/trunk/build/generator/svn_config.vcproj.ezt
subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt
- copied, changed from r1034309, subversion/trunk/build/generator/svn_config.vcxproj.ezt
subversion/trunk/build/generator/templates/svn_locale.dsp.ezt
- copied unchanged from r1034309, subversion/trunk/build/win32/svn_locale.dsp
subversion/trunk/build/generator/templates/svn_locale.vcproj.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/svn_locale.vcproj.ezt
subversion/trunk/build/generator/templates/svn_locale.vcxproj.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/svn_locale.vcxproj.ezt
subversion/trunk/build/generator/templates/zlib.dsp.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/zlib.dsp.ezt
subversion/trunk/build/generator/templates/zlib.vcproj.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/zlib.vcproj.ezt
subversion/trunk/build/generator/templates/zlib.vcxproj.ezt
- copied unchanged from r1034309, subversion/trunk/build/generator/zlib.vcxproj.ezt
Removed:
subversion/trunk/build/generator/build_locale.ezt
subversion/trunk/build/generator/build_zlib.ezt
subversion/trunk/build/generator/msvc_dsp.ezt
subversion/trunk/build/generator/msvc_dsw.ezt
subversion/trunk/build/generator/neon.dsp.ezt
subversion/trunk/build/generator/neon.vcproj.ezt
subversion/trunk/build/generator/neon.vcxproj.ezt
subversion/trunk/build/generator/serf.dsp.ezt
subversion/trunk/build/generator/serf.vcproj.ezt
subversion/trunk/build/generator/serf.vcxproj.ezt
subversion/trunk/build/generator/svn_config.vcproj.ezt
subversion/trunk/build/generator/svn_config.vcxproj.ezt
subversion/trunk/build/generator/svn_locale.vcproj.ezt
subversion/trunk/build/generator/svn_locale.vcxproj.ezt
subversion/trunk/build/generator/zlib.dsp.ezt
subversion/trunk/build/generator/zlib.vcproj.ezt
subversion/trunk/build/generator/zlib.vcxproj.ezt
subversion/trunk/build/win32/svn_config.dsp
subversion/trunk/build/win32/svn_locale.dsp
Modified:
subversion/trunk/build/generator/gen_msvc_dsp.py
subversion/trunk/build/generator/gen_vcnet_vcproj.py
subversion/trunk/build/generator/gen_win.py
Modified: subversion/trunk/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_msvc_dsp.py?rev=1034362&r1=1034361&r2=1034362&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_msvc_dsp.py (original)
+++ subversion/trunk/build/generator/gen_msvc_dsp.py Fri Nov 12 12:09:11 2010
@@ -103,6 +103,18 @@ class Generator(gen_win.WinGeneratorBase
def write(self):
"Write a Workspace (.dsw)"
+ self.move_proj_file(self.projfilesdir,
+ 'svn_config.dsp',
+ (
+ ('sql', sql),
+ ('project_guid', self.makeguid('__CONFIG__')),
+ )
+ )
+ self.move_proj_file(self.projfilesdir,
+ 'svn_locale.dsp',
+ (
+ ('project_guid', self.makeguid('svn_locale')),
+ ))
self.write_zlib_project_file('zlib.dsp')
self.write_neon_project_file('neon.dsp')
self.write_serf_project_file('serf.dsp')
Modified: subversion/trunk/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_vcnet_vcproj.py?rev=1034362&r1=1034361&r2=1034362&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/trunk/build/generator/gen_vcnet_vcproj.py Fri Nov 12 12:09:11 2010
@@ -141,14 +141,14 @@ class Generator(gen_win.WinGeneratorBase
# apr doesn't supply vcproj files, the user must convert them
# manually before loading the generated solution
- self.move_proj_file(os.path.join('build', 'win32'),
+ self.move_proj_file(self.projfilesdir,
'svn_config' + self.vcproj_extension,
(
('sql', sql),
('project_guid', self.makeguid('__CONFIG__')),
)
)
- self.move_proj_file(os.path.join('build', 'win32'),
+ self.move_proj_file(self.projfilesdir,
'svn_locale' + self.vcproj_extension,
(
('project_guid', self.makeguid('svn_locale')),
Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1034362&r1=1034361&r2=1034362&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Fri Nov 12 12:09:11 2010
@@ -282,13 +282,20 @@ class WinGeneratorBase(GeneratorBase):
if self.write_file_if_changed(svnissdeb, buf.replace("@CONFIG@", "Debug")):
print('Wrote %s' % svnissdeb)
+ #Make the project files directory if it doesn't exist
+ #TODO win32 might not be the best path as win64 stuff will go here too
+ self.projfilesdir=os.path.join("build","win32",subdir)
+ self.rootpath = ".." + "\\.." * self.projfilesdir.count(os.sep)
+ if not os.path.exists(self.projfilesdir):
+ os.makedirs(self.projfilesdir)
+
# Generate the build_zlib.bat file
if self.zlib_path:
data = {'zlib_path': os.path.abspath(self.zlib_path),
'zlib_version': self.zlib_version,
'use_ml': self.have_ml and 1 or None}
- bat = os.path.join('build', 'win32', 'build_zlib.bat')
- self.write_with_template(bat, 'build_zlib.ezt', data)
+ bat = os.path.join(self.projfilesdir, 'build_zlib.bat')
+ self.write_with_template(bat, 'templates/build_zlib.ezt', data)
# Generate the build_locale.bat file
pofiles = []
@@ -298,15 +305,9 @@ class WinGeneratorBase(GeneratorBase):
pofiles.append(POFile(po[:-3]))
data = {'pofiles': pofiles}
- self.write_with_template(os.path.join('build', 'win32', 'build_locale.bat'),
- 'build_locale.ezt', data)
-
- #Make the project files directory if it doesn't exist
- #TODO win32 might not be the best path as win64 stuff will go here too
- self.projfilesdir=os.path.join("build","win32",subdir)
- self.rootpath = ".." + "\\.." * self.projfilesdir.count(os.sep)
- if not os.path.exists(self.projfilesdir):
- os.makedirs(self.projfilesdir)
+ self.write_with_template(os.path.join(self.projfilesdir,
+ 'build_locale.bat'),
+ 'templates/build_locale.ezt', data)
#Here we can add additional platforms to compile for
self.platforms = ['Win32']
@@ -679,8 +680,10 @@ class WinGeneratorBase(GeneratorBase):
path = self.neon_path + target.external_project[4:]
elif target.external_project[:5] == 'serf/' and self.serf_lib:
path = self.serf_path + target.external_project[4:]
- else:
+ elif target.external_project.find('/') != -1:
path = target.external_project
+ else:
+ path = os.path.join(self.projfilesdir, target.external_project)
return "%s.%s" % (gen_base.native_path(path), proj_ext)
@@ -1117,7 +1120,7 @@ class WinGeneratorBase(GeneratorBase):
if not self.zlib_path:
return
zlib_path = os.path.abspath(self.zlib_path)
- self.move_proj_file(os.path.join('build', 'win32'), name,
+ self.move_proj_file(self.projfilesdir, name,
(('zlib_path', zlib_path),
('zlib_sources',
glob.glob(os.path.join(zlib_path, '*.c'))
@@ -1129,6 +1132,7 @@ class WinGeneratorBase(GeneratorBase):
glob.glob(os.path.join(zlib_path, '*.h'))),
('zlib_version', self.zlib_version),
('project_guid', self.makeguid('zlib')),
+ ('use_ml', self.have_ml and 1 or None),
))
def write_neon_project_file(self, name):
@@ -1183,7 +1187,7 @@ class WinGeneratorBase(GeneratorBase):
### these projects include zlib, neon, serf, locale, config, etc.
dest_file = os.path.join(path, name)
- source_template = name + '.ezt'
+ source_template = os.path.join('templates', name + '.ezt')
data = {
'version' : self.vcproj_version,
'configs' : self.configs,
Copied: subversion/trunk/build/generator/templates/svn_config.vcproj.ezt (from r1034309, subversion/trunk/build/generator/svn_config.vcproj.ezt)
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/svn_config.vcproj.ezt?p2=subversion/trunk/build/generator/templates/svn_config.vcproj.ezt&p1=subversion/trunk/build/generator/svn_config.vcproj.ezt&r1=1034309&r2=1034362&rev=1034362&view=diff
==============================================================================
--- subversion/trunk/build/generator/svn_config.vcproj.ezt (original)
+++ subversion/trunk/build/generator/templates/svn_config.vcproj.ezt Fri Nov 12 12:09:11 2010
@@ -74,7 +74,7 @@
</FileConfiguration>
[end][end] </File>
[for sql] <File
- RelativePath="../../[sql.source]">
+ RelativePath="../../../[sql.source]">
[for platforms][for configs] <FileConfiguration
Name="[configs]|[platforms]">
<Tool
Copied: subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt (from r1034309, subversion/trunk/build/generator/svn_config.vcxproj.ezt)
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt?p2=subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt&p1=subversion/trunk/build/generator/svn_config.vcxproj.ezt&r1=1034309&r2=1034362&rev=1034362&view=diff
==============================================================================
--- subversion/trunk/build/generator/svn_config.vcxproj.ezt (original)
+++ subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt Fri Nov 12 12:09:11 2010
@@ -58,7 +58,7 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\subversion\svn_private_config.h;%(Outputs)</Outputs>
[end][end] </CustomBuild>
-[for sql] <CustomBuild Include="..\..\[sql.source]">
+[for sql] <CustomBuild Include="..\..\..\[sql.source]">
<FileType>Document</FileType>
[for configs][for platforms] <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Generating [sql.header].</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[sql.svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
Re: svn commit: r1034362 - in /subversion/trunk/build: generator/
generator/templates/ win32/
Posted by Julian Foad <ju...@wandisco.com>.
On Tue, 2011-02-08, Joe Swatosh wrote:
> On Fri, Nov 12, 2010 at 4:09 AM, <rh...@apache.org> wrote:
> > Log:
> > Move projects generated by the Windows build to the right locations. The
> > necessary changes in the python scripting to handle this also allowed moving
> > the remaining project templates .ezt files to the templates directory.
> >
> > Please let me know if this patch breaks something for you.
>
> Okay, its a lot later, but this broke my build and r1034366 didn't fix it.
>
> python gen-make.py -t dsp ^
[...]
> ^ --with-sqlite=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/sqlite-3.6.20
>
>
> gives me
>
> Traceback (most recent call last):
> File "gen-make.py", line 311, in ?
> main(conf, gentype, skip_depends=skip, other_options=rest.list)
> File "gen-make.py", line 65, in main
> generator.write()
> File "build\generator\gen_msvc_dsp.py", line 108, in write
> (
> NameError: global name 'sql' is not defined
For the record, it looks like this was fixed in r1068863.
- Julian
Re: svn commit: r1034362 - in /subversion/trunk/build: generator/
generator/templates/ win32/
Posted by Joe Swatosh <jo...@gmail.com>.
On Fri, Nov 12, 2010 at 4:09 AM, <rh...@apache.org> wrote:
> Author: rhuijben
> Date: Fri Nov 12 12:09:11 2010
> New Revision: 1034362
>
> URL: http://svn.apache.org/viewvc?rev=1034362&view=rev
> Log:
> Move projects generated by the Windows build to the right locations. The
> necessary changes in the python scripting to handle this also allowed moving
> the remaining project templates .ezt files to the templates directory.
>
> Please let me know if this patch breaks something for you.
>
Okay, its a lot later, but this broke my build and r1034366 didn't fix it.
python gen-make.py -t dsp ^
--with-apr=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/apr
^ --with-apr-util=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/apr-util
^
--with-sasl=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/sasl
^ --with-openssl=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/openssl-0.9.7d
^ --with-zlib=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/zlib-1.2.3
^
--with-swig=C:\Users\joe-swatosh\Documents\SVN\BuildTools\swigwin-1.3.31
^ --with-libintl=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/svn-win32-libintl
^
--enable-nls --enable-bdb-in-apr-util ^
--with-neon=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/neon-0.28.6
^
--with-serf=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/serf-0.3.0
^ --with-berkeley-db=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/db4-win32
^ --with-sqlite=C:/Users/joe-swatosh/Documents/SVN/src-trunk/svn-build-dependencies/mswin/sqlite-3.6.20
gives me
Traceback (most recent call last):
File "gen-make.py", line 311, in ?
main(conf, gentype, skip_depends=skip, other_options=rest.list)
File "gen-make.py", line 65, in main
generator.write()
File "build\generator\gen_msvc_dsp.py", line 108, in write
(
NameError: global name 'sql' is not defined
I tried the stupid easy fixes (sql=[] and copy pasting the relevant
part from gen_vcnet_vcproj.py), but got no where.
Any ideas?
Thanks,
--
Joe