Context Navigation

← Previous Changeset
Next Changeset →

Changeset 667

Timestamp:

14/08/08 14:06:26 (5 months ago)

Author:

ono

Message:

* generate configuration XML files out of dist files on build (using Perl)
* copy default server.pem (localhost)
* add Perl dependency to README.win32

Location:

trunk

Files:

: 2 added
: 5 modified

README.win32 (modified) (1 diff)
win32/c2s/c2s.vcproj (modified) (1 diff)
win32/router/router.vcproj (modified) (1 diff)
win32/s2s/s2s.vcproj (modified) (1 diff)
win32/setup/make-config.pl (added)
win32/setup/server.pem (added)
win32/sm/sm.vcproj (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/README.win32

r665	r667
61	61	WiX 3.0.4401.0 or newer for building MSI jabberd2 setup inside VS2005 IDE
62	62
	63	9. http://www.activestate.com/store/activeperl/download/
	64
	65	ActivePerl (or any Perl distribution) perl command present in PATH
	66	(optional for generation of default configuration XML files)
	67
63	68	After all prerequisite libraries are configured for use within VC open
64	69	win32/jabberd2.sln and build all projects.

trunk/win32/c2s/c2s.vcproj

r664	r667
234	234	>
235	235	<File
	236	RelativePath="..\..\etc\c2s.xml.dist.in"
	237	>
	238	<FileConfiguration
	239	Name="Debug\|Win32"
	240	>
	241	<Tool
	242	Name="VCCustomBuildTool"
	243	Description="Generating configuration: $(TargetDir)$(TargetName).xml"
	244	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName).xml"
	245	AdditionalDependencies="../setup/make-config.pl"
	246	Outputs="$(TargetDir)$(TargetName).xml"
	247	/>
	248	</FileConfiguration>
	249	<FileConfiguration
	250	Name="Release\|Win32"
	251	>
	252	<Tool
	253	Name="VCCustomBuildTool"
	254	Description="Generating configuration: $(TargetDir)$(TargetName).xml"
	255	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName).xml"
	256	AdditionalDependencies="../setup/make-config.pl"
	257	Outputs="$(TargetDir)$(TargetName).xml"
	258	/>
	259	</FileConfiguration>
	260	</File>
	261	<File
236	262	RelativePath="..\jabberd2.rc"
237	263	>
	264	</File>
	265	<File
	266	RelativePath="..\setup\server.pem"
	267	>
	268	<FileConfiguration
	269	Name="Debug\|Win32"
	270	>
	271	<Tool
	272	Name="VCCustomBuildTool"
	273	Description="Generating default certificate: $(TargetDir)$(InputFileName)"
	274	CommandLine="copy /y $(InputPath) $(TargetDir)$(InputFileName)"
	275	Outputs="$(TargetDir)$(InputFileName)"
	276	/>
	277	</FileConfiguration>
	278	<FileConfiguration
	279	Name="Release\|Win32"
	280	>
	281	<Tool
	282	Name="VCCustomBuildTool"
	283	Description="Generating default certificate: $(TargetDir)$(InputFileName)"
	284	CommandLine="copy /y $(InputPath) $(TargetDir)$(InputFileName)"
	285	Outputs="$(TargetDir)$(InputFileName)"
	286	/>
	287	</FileConfiguration>
238	288	</File>
239	289	</Filter>

trunk/win32/router/router.vcproj

r664	r667
245	245	>
246	246	</File>
	247	<File
	248	RelativePath="..\..\etc\router-filter.xml.dist.in"
	249	>
	250	<FileConfiguration
	251	Name="Debug\|Win32"
	252	>
	253	<Tool
	254	Name="VCCustomBuildTool"
	255	Description="Generating configuration: $(TargetDir)$(TargetName)-filter.xml"
	256	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName)-filter.xml"
	257	AdditionalDependencies="../setup/make-config.pl"
	258	Outputs="$(TargetDir)$(TargetName)-filter.xml"
	259	/>
	260	</FileConfiguration>
	261	<FileConfiguration
	262	Name="Release\|Win32"
	263	>
	264	<Tool
	265	Name="VCCustomBuildTool"
	266	Description="Generating configuration: $(TargetDir)$(TargetName)-filter.xml"
	267	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName)-filter.xml"
	268	AdditionalDependencies="../setup/make-config.pl"
	269	Outputs="$(TargetDir)$(TargetName)-filter.xml"
	270	/>
	271	</FileConfiguration>
	272	</File>
	273	<File
	274	RelativePath="..\..\etc\router-users.xml.dist.in"
	275	>
	276	<FileConfiguration
	277	Name="Debug\|Win32"
	278	>
	279	<Tool
	280	Name="VCCustomBuildTool"
	281	Description="Generating configuration: $(TargetDir)$(TargetName)-users.xml"
	282	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName)-users.xml"
	283	AdditionalDependencies="../setup/make-config.pl"
	284	Outputs="$(TargetDir)$(TargetName)-users.xml"
	285	/>
	286	</FileConfiguration>
	287	<FileConfiguration
	288	Name="Release\|Win32"
	289	>
	290	<Tool
	291	Name="VCCustomBuildTool"
	292	Description="Generating configuration: $(TargetDir)$(TargetName)-users.xml"
	293	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName)-users.xml"
	294	AdditionalDependencies="../setup/make-config.pl"
	295	Outputs="$(TargetDir)$(TargetName)-users.xml"
	296	/>
	297	</FileConfiguration>
	298	</File>
	299	<File
	300	RelativePath="..\..\etc\router.xml.dist.in"
	301	>
	302	<FileConfiguration
	303	Name="Debug\|Win32"
	304	>
	305	<Tool
	306	Name="VCCustomBuildTool"
	307	Description="Generating configuration: $(TargetDir)$(TargetName).xml"
	308	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName).xml"
	309	AdditionalDependencies="../setup/make-config.pl"
	310	Outputs="$(TargetDir)$(TargetName).xml"
	311	/>
	312	</FileConfiguration>
	313	<FileConfiguration
	314	Name="Release\|Win32"
	315	>
	316	<Tool
	317	Name="VCCustomBuildTool"
	318	Description="Generating configuration: $(TargetDir)$(TargetName).xml"
	319	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName).xml"
	320	AdditionalDependencies="../setup/make-config.pl"
	321	Outputs="$(TargetDir)$(TargetName).xml"
	322	/>
	323	</FileConfiguration>
	324	</File>
	325	<File
	326	RelativePath="..\setup\server.pem"
	327	>
	328	<FileConfiguration
	329	Name="Debug\|Win32"
	330	>
	331	<Tool
	332	Name="VCCustomBuildTool"
	333	Description="Generating default certificate: $(TargetDir)$(InputFileName)"
	334	CommandLine="copy /y $(InputPath) $(TargetDir)$(InputFileName)"
	335	Outputs="$(TargetDir)$(InputFileName)"
	336	/>
	337	</FileConfiguration>
	338	<FileConfiguration
	339	Name="Release\|Win32"
	340	>
	341	<Tool
	342	Name="VCCustomBuildTool"
	343	Description="Generating default certificate: $(TargetDir)$(InputFileName)"
	344	CommandLine="copy /y $(InputPath) $(TargetDir)$(InputFileName)"
	345	Outputs="$(TargetDir)$(InputFileName)"
	346	/>
	347	</FileConfiguration>
	348	</File>
247	349	</Filter>
248	350	</Files>

trunk/win32/s2s/s2s.vcproj

r664	r667
241	241	>
242	242	</File>
	243	<File
	244	RelativePath="..\..\etc\s2s.xml.dist.in"
	245	>
	246	<FileConfiguration
	247	Name="Debug\|Win32"
	248	>
	249	<Tool
	250	Name="VCCustomBuildTool"
	251	Description="Generating configuration: $(TargetDir)$(TargetName).xml"
	252	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName).xml"
	253	AdditionalDependencies="../setup/make-config.pl"
	254	Outputs="$(TargetDir)$(TargetName).xml"
	255	/>
	256	</FileConfiguration>
	257	<FileConfiguration
	258	Name="Release\|Win32"
	259	>
	260	<Tool
	261	Name="VCCustomBuildTool"
	262	Description="Generating configuration: $(TargetDir)$(TargetName).xml"
	263	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName).xml"
	264	AdditionalDependencies="../setup/make-config.pl"
	265	Outputs="$(TargetDir)$(TargetName).xml"
	266	/>
	267	</FileConfiguration>
	268	</File>
	269	<File
	270	RelativePath="..\setup\server.pem"
	271	>
	272	<FileConfiguration
	273	Name="Debug\|Win32"
	274	>
	275	<Tool
	276	Name="VCCustomBuildTool"
	277	Description="Generating default certificate: $(TargetDir)$(InputFileName)"
	278	CommandLine="copy /y $(InputPath) $(TargetDir)$(InputFileName)"
	279	Outputs="$(TargetDir)$(InputFileName)"
	280	/>
	281	</FileConfiguration>
	282	<FileConfiguration
	283	Name="Release\|Win32"
	284	>
	285	<Tool
	286	Name="VCCustomBuildTool"
	287	Description="Generating default certificate: $(TargetDir)$(InputFileName)"
	288	CommandLine="copy /y $(InputPath) $(TargetDir)$(InputFileName)"
	289	Outputs="$(TargetDir)$(InputFileName)"
	290	/>
	291	</FileConfiguration>
	292	</File>
243	293	</Filter>
244	294	</Files>

trunk/win32/sm/sm.vcproj

r664	r667
265	265	>
266	266	</File>
	267	<File
	268	RelativePath="..\setup\server.pem"
	269	>
	270	<FileConfiguration
	271	Name="Debug\|Win32"
	272	>
	273	<Tool
	274	Name="VCCustomBuildTool"
	275	Description="Generating default certificate: $(TargetDir)$(InputFileName)"
	276	CommandLine="copy /y $(InputPath) $(TargetDir)$(InputFileName)"
	277	Outputs="$(TargetDir)$(InputFileName)"
	278	/>
	279	</FileConfiguration>
	280	<FileConfiguration
	281	Name="Release\|Win32"
	282	>
	283	<Tool
	284	Name="VCCustomBuildTool"
	285	Description="Generating default certificate: $(TargetDir)$(InputFileName)"
	286	CommandLine="copy /y $(InputPath) $(TargetDir)$(InputFileName)"
	287	Outputs="$(TargetDir)$(InputFileName)"
	288	/>
	289	</FileConfiguration>
	290	</File>
	291	<File
	292	RelativePath="..\..\etc\sm.xml.dist.in"
	293	>
	294	<FileConfiguration
	295	Name="Debug\|Win32"
	296	>
	297	<Tool
	298	Name="VCCustomBuildTool"
	299	Description="Generating configuration: $(TargetDir)$(TargetName).xml"
	300	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName).xml"
	301	AdditionalDependencies="../setup/make-config.pl"
	302	Outputs="$(TargetDir)$(TargetName).xml"
	303	/>
	304	</FileConfiguration>
	305	<FileConfiguration
	306	Name="Release\|Win32"
	307	>
	308	<Tool
	309	Name="VCCustomBuildTool"
	310	Description="Generating configuration: $(TargetDir)$(TargetName).xml"
	311	CommandLine="perl ../setup/make-config.pl $(InputPath) > $(TargetDir)$(TargetName).xml"
	312	AdditionalDependencies="../setup/make-config.pl"
	313	Outputs="$(TargetDir)$(TargetName).xml"
	314	/>
	315	</FileConfiguration>
	316	</File>
267	317	</Filter>
268	318	</Files>