Changeset - r4370:66ce7acfafc7
[Not reviewed]
master
0 6 0
truelight - 18 years ago 2006-08-24 12:08:25
truelight@openttd.org
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
6 files changed with 170 insertions and 118 deletions:
0 comments (0 inline, 0 general)
Makefile
Show inline comments
 
@@ -876,23 +876,23 @@ ifndef MACOSX_BUILD
 
# OSX links in os/macosx/Makefile to handle universal binaries better
 
$(TTD): $(OBJS) $(MAKE_CONFIG)
 
	@echo '===> Linking $@'
 
	$(Q)$(CXX_TARGET) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS) $(LIBS) -o $@
 
endif
 

	
 
$(STRGEN): strgen/strgen.c endian_host.h
 
$(STRGEN): strgen/strgen.c string.c endian_host.h
 
	@echo '===> Compiling and Linking $@'
 
	$(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@
 
	$(Q)$(CC_HOST) $(CFLAGS_HOST) -DSTRGEN strgen/strgen.c string.c -o $@
 

	
 
table/strings.h: lang/english.txt $(STRGEN)
 
	@echo '===> Generating $@'
 
	$(Q)$(STRGEN)
 
	$(Q)$(STRGEN) -s lang -d table
 

	
 
lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt
 
	@echo '===> Compiling language $(*F)'
 
	$(Q)$(STRGEN) $(STRGEN_FLAGS) $< $(LANG_ERRORS) || rm -f $@
 
	$(Q)$(STRGEN) $(STRGEN_FLAGS) -s lang -d lang $< $(LANG_ERRORS) || rm -f $@
 

	
 
# stupid KUDr doesn't know how to setup unittest dependencies (so rm,cp,rm)
 
# please don't blame him and repair it:
 
unittest: endian_host.h $(UPDATECONFIG) $(UNITTEST) rununittest
 
$(UNITTEST): yapf/unittest/unittest.cpp
 
	@echo '===> Compiling and Linking $@'
langs.vcproj
Show inline comments
 
@@ -28,314 +28,314 @@
 
				HeaderFileName=""/>
 
			<Tool
 
				Name="VCPostBuildEventTool"/>
 
			<Tool
 
				Name="VCPreBuildEventTool"
 
				Description="Generating strings.h"
 
				CommandLine="strgen\debug\strgen.exe"/>
 
				CommandLine="strgen\debug\strgen.exe -s lang -d table"/>
 
		</Configuration>
 
	</Configurations>
 
	<References>
 
	</References>
 
	<Files>
 
		<File
 
			RelativePath=".\lang\american.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating american language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\american.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\brazilian_portuguese.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating brazilian_portuguese language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\brazilian_portuguese.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\catalan.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating catalan language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\catalan.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\czech.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating czech language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\czech.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\danish.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating danish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\danish.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\dutch.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating dutch language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\dutch.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath="lang\english.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating english language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\english.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\estonian.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating estonian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;"
 
					Outputs="lang\estonian.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\finnish.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating finnish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\finnish.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\french.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating french language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\french.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\galician.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating galician language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\galician.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\german.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating german language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\german.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\hungarian.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating hungarian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\hungarian.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\icelandic.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating icelandic language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\icelandic.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\italian.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating italian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\italian.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\lithuanian.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				ExcludedFromBuild="TRUE">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating lithuanian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\lithuanian.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\norwegian.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating norwegian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\norwegian.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\origveh.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating Original Vehicle names file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\origveh.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\polish.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating polish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\polish.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\portuguese.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating portuguese language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\portuguese.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\romanian.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating romanian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\romanian.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\slovak.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating slovak language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\slovak.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\spanish.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating spanish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\spanish.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath="lang\swedish.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating swedish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 
"
 
					Outputs="lang\swedish.lng"/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\turkish.txt">
 
			<FileConfiguration
 
				Name="Debug|Win32">
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating turkish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;"
 
					Outputs="lang\turkish.lng"/>
 
			</FileConfiguration>
 
		</File>
 
	</Files>
 
	<Globals>
 
	</Globals>
langs_vs80.vcproj
Show inline comments
 
@@ -24,13 +24,13 @@
 
			UseOfMFC="0"
 
			ATLMinimizesCRunTimeLibraryUsage="false"
 
			>
 
			<Tool
 
				Name="VCPreBuildEventTool"
 
				Description="Generating strings.h"
 
				CommandLine="strgen\debug\strgen.exe"
 
				CommandLine="strgen\debug\strgen.exe -s lang -d table"
 
			/>
 
			<Tool
 
				Name="VCCustomBuildTool"
 
			/>
 
			<Tool
 
				Name="VCMIDLTool"
 
@@ -51,13 +51,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating american language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\american.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\brazilian_portuguese.txt"
 
@@ -65,13 +65,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating brazilian_portuguese language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\brazilian_portuguese.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\catalan.txt"
 
@@ -79,13 +79,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating catalan language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\catalan.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\czech.txt"
 
@@ -93,13 +93,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating czech language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\czech.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\danish.txt"
 
@@ -107,13 +107,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating danish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\danish.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\dutch.txt"
 
@@ -121,13 +121,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating dutch language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\dutch.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath="lang\english.txt"
 
@@ -135,13 +135,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating english language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\english.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\estonian.txt"
 
@@ -149,13 +149,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating estonian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\estonian.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\finnish.txt"
 
@@ -163,13 +163,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating finnish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\finnish.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\french.txt"
 
@@ -177,13 +177,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating french language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\french.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\galician.txt"
 
@@ -191,13 +191,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating galician language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\galician.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\german.txt"
 
@@ -205,13 +205,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating german language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\german.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\hungarian.txt"
 
@@ -219,13 +219,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating hungarian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\hungarian.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\icelandic.txt"
 
@@ -233,13 +233,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating icelandic language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\icelandic.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\italian.txt"
 
@@ -247,13 +247,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating italian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\italian.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\lithuanian.txt"
 
@@ -262,13 +262,13 @@
 
				Name="Debug|Win32"
 
				ExcludedFromBuild="true"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating lithuanian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\lithuanian.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\norwegian.txt"
 
@@ -276,13 +276,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating norwegian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\norwegian.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\origveh.txt"
 
@@ -290,13 +290,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating Original Vehicle names file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\origveh.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\polish.txt"
 
@@ -304,13 +304,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating polish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\polish.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\portuguese.txt"
 
@@ -318,13 +318,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating portuguese language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\portuguese.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\romanian.txt"
 
@@ -332,13 +332,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating romanian language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\romanian.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\slovak.txt"
 
@@ -346,13 +346,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating slovak language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\slovak.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\spanish.txt"
 
@@ -360,13 +360,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating spanish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\spanish.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath="lang\swedish.txt"
 
@@ -374,13 +374,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating swedish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\swedish.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
		<File
 
			RelativePath=".\lang\turkish.txt"
 
@@ -388,13 +388,13 @@
 
			<FileConfiguration
 
				Name="Debug|Win32"
 
				>
 
				<Tool
 
					Name="VCCustomBuildTool"
 
					Description="Generating turkish language file"
 
					CommandLine="strgen\debug\strgen.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 
					Outputs="lang\turkish.lng"
 
				/>
 
			</FileConfiguration>
 
		</File>
 
	</Files>
 
	<Globals>
strgen/strgen.c
Show inline comments
 
/* $Id$ */
 

	
 
#define STRGEN
 
#if defined(WIN32) || defined(WIN64) || defined(__CYGWIN__)
 
#define WIN32
 
#else
 
#define UNIX
 
#endif
 

	
 
#include "../stdafx.h"
 
#include "../macros.h"
 
#include "../string.h"
 
#include <stdio.h>
 
#include <string.h>
 
#include <stdlib.h>
 
#include <stdarg.h>
 

	
 
#if (!defined(WIN32) && !defined(WIN64)) || defined(__CYGWIN__)
 
#include <unistd.h>
 
#endif
 

	
 
#if defined WIN32 || defined __WATCOMC__
 
#include <direct.h>
 
#endif /* WIN32 || __WATCOMC__ */
 

	
 
#ifdef __MORPHOS__
 
#ifdef stderr
 
#undef stderr
 
#endif
 
#define stderr stdout
 
#endif // __MORPHOS__
 
#endif /* __MORPHOS__ */
 

	
 
#ifdef __WATCOMC__
 
	uint _map_log_x;     // an unpleasant hack required because Watcom is insisting on
 
	uint _map_size_x;    // these variables being valid references in map.h
 
	uint _map_size_y;
 
	uint _map_tile_mask;
 
	uint _map_size;
 
#endif
 
#endif /* __WATCOMC__ */
 

	
 
/* Compiles a list of strings into a compiled string list */
 

	
 
typedef void (*ParseCmdProc)(char *buf, int value);
 

	
 
typedef struct LanguagePackHeader {
 
@@ -157,51 +166,42 @@ static LangString *HashFind(const char *
 

	
 
static void CDECL Warning(const char *s, ...)
 
{
 
	char buf[1024];
 
	va_list va;
 
	va_start(va, s);
 
	vsprintf(buf, s, va);
 
	vsnprintf(buf, lengthof(buf), s, va);
 
	va_end(va);
 
	fprintf(stderr, "%s" LINE_NUM_FMT ": Warning: %s\n", _file, _cur_line, buf);
 
	_warnings++;
 
}
 

	
 

	
 
static void CDECL Error(const char *s, ...)
 
{
 
	char buf[1024];
 
	va_list va;
 
	va_start(va, s);
 
	vsprintf(buf, s, va);
 
	vsnprintf(buf, lengthof(buf), s, va);
 
	va_end(va);
 
	fprintf(stderr, "%s" LINE_NUM_FMT ": Error: %s\n", _file, _cur_line, buf);
 
	_errors++;
 
}
 

	
 

	
 
static void NORETURN CDECL Fatal(const char *s, ...)
 
{
 
	char buf[1024];
 
	va_list va;
 
	va_start(va, s);
 
	vsprintf(buf, s, va);
 
	vsnprintf(buf, lengthof(buf), s, va);
 
	va_end(va);
 
	fprintf(stderr, "%s" LINE_NUM_FMT ": FATAL: %s\n", _file, _cur_line, buf);
 
	exit(1);
 
}
 

	
 

	
 
static void ttd_strlcpy(char *dst, const char *src, size_t len)
 
{
 
	assert(len > 0);
 
	while (--len > 0 && *src != '\0') *dst++ = *src++;
 
	*dst = '\0';
 
}
 

	
 

	
 
static void PutByte(byte c)
 
{
 
	if (_put_pos == lengthof(_put_buf)) Fatal("Put buffer too small");
 
	_put_buf[_put_pos++] = c;
 
}
 

	
 
@@ -1202,79 +1202,128 @@ static void WriteLangfile(const char *fi
 
	}
 

	
 
	fputc(0, f);
 
	fclose(f);
 
}
 

	
 
/** Multi-OS mkdirectory function */
 
static inline void ottd_mkdir(const char *directory)
 
{
 
#if defined(WIN32) || defined(__WATCOMC__)
 
		mkdir(directory);
 
#else
 
		mkdir(directory, 0755);
 
#endif
 
}
 

	
 
/** Create a path consisting of an already existing path, a possible
 
 * path seperator and the filename. The seperator is only appended if the path
 
 * does not already end with a seperator */
 
static inline char *mkpath(char *buf, size_t buflen, const char *path, const char *file)
 
{
 
	char *p;
 
	ttd_strlcpy(buf, path, buflen); // copy directory into buffer
 

	
 
	p = strchr(buf, '\0'); // add path seperator if necessary
 
	if (p[-1] != PATHSEPCHAR && (size_t)(p - buf) + 1 < buflen) *p++ = PATHSEPCHAR;
 
	ttd_strlcpy(p, file, buflen - (size_t)(p - buf)); // catenate filename at end of buffer
 
	return buf;
 
}
 

	
 

	
 
int CDECL main(int argc, char* argv[])
 
{
 
	char pathbuf[256];
 
	const char *src_dir, *dest_dir;
 

	
 
	int show_todo = 0;
 

	
 
	if (argc > 1 && (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0)) {
 
		puts("$Revision$");
 
		return 0;
 
	}
 

	
 
	if (argc > 1 &&
 
			(strcmp(argv[1], "-t") == 0 || strcmp(argv[1], "--todo") == 0)) {
 
	if (argc > 1 && (strcmp(argv[1], "-t") == 0 || strcmp(argv[1], "--todo") == 0)) {
 
		show_todo = 1;
 
		argc--, argv++;
 
	}
 

	
 
	if (argc > 1 &&
 
			(strcmp(argv[1], "-w") == 0 || strcmp(argv[1], "--warning") == 0)) {
 
	if (argc > 1 && (strcmp(argv[1], "-w") == 0 || strcmp(argv[1], "--warning") == 0)) {
 
		show_todo = 2;
 
		argc--, argv++;
 
	}
 

	
 
	if (argc > 1 && (
 
				strcmp(argv[1], "-h") == 0 ||
 
				strcmp(argv[1], "--help") == 0 ||
 
				strcmp(argv[1], "-?") == 0
 
			)) {
 
		puts(
 
			"strgen - $Revision$\n"
 
			" -v | --version    print version information and exit\n"
 
			" -h | -? | --help  print this help message and exit\n"
 
			" -t | --todo       replace any untranslated strings with '<TODO>'\n"
 
			" -w | --warning    print a warning for any untranslated strings\n"
 
			" Run without parameters strgen will search for lang/english.txt and\n"
 
			" parse it. Passing an argument, strgen will translate that language\n"
 
			" file with lang/english.txt as a reference."
 
			" -h | -? | --help  print this help message and exit\n"
 
			" -s | --source_dir search for english.txt in the specified directory\n"
 
			" -d | --dest_dir   put output file in the specified directory, create if needed\n"
 
			" Run without parameters and strgen will search for english.txt and parse it,\n"
 
			" creating strings.h. Passing an argument, strgen will translate that language\n"
 
			" file using english.txt as a reference and output <language>.lng."
 
		);
 
		return 0;
 
	}
 

	
 
	src_dir = dest_dir = ".";
 
	if (argc > 2 && (strcmp(argv[1], "-s") == 0 || strcmp(argv[1], "--source_dir") == 0)) {
 
		src_dir = dest_dir = argv[2]; // if dest_dir is not specified, it equals src_dir
 
		argc -= 2, argv += 2;
 
	}
 

	
 
	if (argc > 2 && (strcmp(argv[1], "-d") == 0 || strcmp(argv[1], "--dest_dir") == 0)) {
 
		dest_dir = argv[2];
 
		argc -= 2, argv += 2;
 
	}
 

	
 
	/* strgen has two modes of operation. If no (free) arguments are passed
 
	 * strgen generates strings.h to the destination directory. If it is supplied
 
	 * with a (free) parameter the program will translate that language to destination
 
	 * directory. As input english.txt is parsed from the source directory */
 
	if (argc == 1) {
 
		mkpath(pathbuf, lengthof(pathbuf), src_dir, "english.txt");
 

	
 
		/* parse master file */
 
		_masterlang = true;
 
		// parse master file
 
		ParseFile("lang/english.txt", true);
 
		ParseFile(pathbuf, true);
 
		MakeHashOfStrings();
 
		if (_errors) return 1;
 

	
 
		// write english.lng and strings.h
 

	
 
		WriteLangfile("lang/english.lng", 0);
 
		WriteStringsH("table/strings.h");
 
		/* write strings.h */
 
		ottd_mkdir(dest_dir);
 
		mkpath(pathbuf, lengthof(pathbuf), dest_dir, "strings.h");
 
		WriteStringsH(pathbuf);
 
	} else if (argc == 2) {
 
		char buf[256];
 
		char* r;
 
		char *r;
 

	
 
		mkpath(pathbuf, lengthof(pathbuf), src_dir, "english.txt");
 

	
 
		/* parse master file and check if target file is correct */
 
		_masterlang = false;
 
		ParseFile("lang/english.txt", true);
 
		ParseFile(pathbuf, true);
 
		MakeHashOfStrings();
 
		ParseFile(argv[1], false);
 

	
 
		ParseFile(argv[1], false); // target file
 
		if (_errors) return 1;
 

	
 
		strcpy(buf, argv[1]);
 
		r = strrchr(buf, '.');
 
		if (r == NULL || strcmp(r, ".txt") != 0) r = strchr(buf, 0);
 
		strcpy(r, ".lng");
 
		WriteLangfile(buf, show_todo);
 
		/* get the targetfile, strip any directories and append to destination path */
 
		r = strrchr(argv[1], PATHSEPCHAR);
 
		mkpath(pathbuf, lengthof(pathbuf), dest_dir, (r != NULL) ? &r[1] : argv[1]);
 

	
 
		/* rename the .txt (input-extension) to .lng */
 
		r = strrchr(pathbuf, '.');
 
		if (r == NULL || strcmp(r, ".txt") != 0) r = strchr(pathbuf, '\0');
 
		ttd_strlcpy(r, ".lng", (size_t)(r - pathbuf));
 
		WriteLangfile(pathbuf, show_todo);
 
	} else {
 
		fprintf(stderr, "invalid arguments\n");
 
		fprintf(stderr, "Invalid arguments\n");
 
	}
 

	
 
	return 0;
 
}
string.c
Show inline comments
 
@@ -49,13 +49,13 @@ char* CDECL str_fmt(const char* str, ...
 
	char buf[4096];
 
	va_list va;
 
	int len;
 
	char* p;
 

	
 
	va_start(va, str);
 
	len = vsprintf(buf, str, va);
 
	len = vsnprintf(buf, lengthof(buf), str, va);
 
	va_end(va);
 
	p = malloc(len + 1);
 
	if (p != NULL) memcpy(p, buf, len + 1);
 
	return p;
 
}
 

	
 
@@ -98,6 +98,30 @@ bool IsValidAsciiChar(byte key, CharSetF
 
}
 

	
 
void strtolower(char *str)
 
{
 
	for (; *str != '\0'; str++) *str = tolower(*str);
 
}
 

	
 
#ifdef WIN32
 
int CDECL snprintf(char *str, size_t size, const char *format, ...)
 
{
 
	va_list ap;
 
	int ret;
 

	
 
	va_start(ap, format);
 
	ret = vsnprintf(str, size, format, ap);
 
	va_end(ap);
 
	return ret;
 
}
 

	
 
#ifdef _MSC_VER
 
int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap)
 
{
 
	int ret;
 
	ret = _vsnprintf(str, size, format, ap);
 
	if (ret < 0) str[size - 1] = '\0';
 
	return ret;
 
}
 
#endif /* _MSC_VER */
 

	
 
#endif /* WIN32 */
win32.c
Show inline comments
 
@@ -914,33 +914,12 @@ void DeterminePaths(void)
 
	CreateDirectory(_path.save_dir, NULL);
 
	CreateDirectory(_path.autosave_dir, NULL);
 
	CreateDirectory(_path.scenario_dir, NULL);
 
	CreateDirectory(_path.heightmap_dir, NULL);
 
}
 

	
 
int CDECL snprintf(char *str, size_t size, const char *format, ...)
 
{
 
	va_list ap;
 
	int ret;
 

	
 
	va_start(ap, format);
 
	ret = vsnprintf(str, size, format, ap);
 
	va_end(ap);
 
	return ret;
 
}
 

	
 
#ifdef _MSC_VER
 
int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap)
 
{
 
	int ret;
 
	ret = _vsnprintf(str, size, format, ap);
 
	if (ret < 0) str[size - 1] = '\0';
 
	return ret;
 
}
 
#endif
 

	
 
/**
 
 * Insert a chunk of text from the clipboard onto the textbuffer. Get TEXT clipboard
 
 * and append this up to the maximum length (either absolute or screenlength). If maxlength
 
 * is zero, we don't care about the screenlength but only about the physical length of the string
 
 * @param tb @Textbuf type to be changed
 
 * @return Return true on successfull change of Textbuf, or false otherwise
0 comments (0 inline, 0 general)