I've updated the little dsp template patch to move the output tree to
the right place (I think -- it should be a sibling of build, right?) and
defined the SVN_FILE_NAME for the version resource.
Some tests still don't build until the shared main source files are
manually added, and I have to build neon manually also, but everything
else is building.
I'm running the tests now, but getting lots of failures -- it looks like
at least some of them are svn_io_file_remove failing because the file is
read-only...that is from the chmod changes, I guess? Is anyone
interested in the log, or are those known and being worked on?
DJ
Index: build/generator/msvc_dsp.ezt
===================================================================
--- build/generator/msvc_dsp.ezt (revision 5862)
+++ build/generator/msvc_dsp.ezt (working copy)
@@ -37,16 +37,16 @@
# PROP Rebuild_Opt "rebuild"
# PROP Target_File "[rootpath]\[target.path]\[is configs.name "Debug"][target.debug][else][target.release][end]"
# PROP Target_Dir "[rootpath]\[target.path]"
-[else]# PROP Output_Dir "[rootpath]\[configs.name]"
-# PROP Intermediate_Dir "[configs.name]\[target.name]"
+[else]# PROP Output_Dir "[rootpath]\[configs.name]\[target.path]"
+# PROP Intermediate_Dir "[rootpath]\[configs.name]\[target.path]"
# PROP Target_Dir ""
[if-any is_utility][else]LIB32=link.exe -lib
-# ADD LIB32 /out:"[rootpath]\[configs.name]\[target.dsp_name].lib"
+# ADD LIB32 /out:"[rootpath]\[configs.name]\[target.path]\[target.dsp_name].lib"
# ADD CPP /nologo /W3 /FD /c [is configs.name "Debug"]/MDd /Gm /Gi /GX /ZI /Od /GZ[else]/MD /GX /O2 /Ob2[end][for configs.defines] /D "[configs.defines]"[end][for includes] /I "[includes]"[end]
# ADD RSC /l [if-any is_exe]0x409[else]0x424[end]
BSC32=bscmake.exe
LINK32=link.exe
-[if-any is_exe is_apache_mod]# ADD LINK32 /nologo [is configs.name "Debug"]/debug[end] [if-any is_apache_mod]/dll[end] /machine:IX86[for libs] [libs][end][for configs.libdirs] /libpath:"[configs.libdirs]"[end] /out:"[rootpath]\[configs.name]\[target.name].[if-any is_exe]exe[else]dll[end]"
+[if-any is_exe is_apache_mod]# ADD LINK32 /nologo [is configs.name "Debug"]/debug[end] [if-any is_apache_mod]/dll[end] /machine:IX86[for libs] [libs][end][for configs.libdirs] /libpath:"[configs.libdirs]"[end] /out:"[rootpath]\[configs.name]\[target.path]\[target.name].[if-any is_exe]exe[else]so[end]"
[end][end][end][end][end]
!ENDIF
@@ -59,10 +59,18 @@
[for platforms][for configs]
![if-index platforms first][if-index configs first][else]ELSE[end][else]ELSE[end]IF "$(CFG)" == "[target.dsp_name] - [platforms] [configs.name]"
-# PROP Intermediate_Dir "[configs.name]\[target.name]\[sources.reldir]"
+# PROP Intermediate_Dir "[rootpath]\[configs.name]\[target.name]\[sources.reldir]"
[end][end]
!ENDIF
[end]
# End Source File
-[end]# End Target
+[end]
+[if-any is_exe is_apache_mod]
+# Begin Source File
+
+SOURCE="[rootpath]\build\win32\svn.rc"
+# ADD RSC /d "SVN_FILE_NAME=[target.name].[if-any is_exe]exe[else]so[end]"
+# End Source File
+[end]
+# End Target
# End Project
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat May 10 04:46:21 2003