diff --git a/projects/generate b/projects/generate index 36f44a8ad5..542a27d6e1 100755 --- a/projects/generate +++ b/projects/generate @@ -177,28 +177,35 @@ load_lang_data() { for i in `ls $1` do i=`basename $i | sed s~.txt$~~g` + if [ "$i" == "english" ] + then + continue + fi RES="$RES -#1 -#1 -#1 -#1 -#1 +#1 +#1 +#1 +#1 #2 #2 Generating "$i" language file #2 ..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang \"%(FullPath)\" #2 ..\\src\\lang\\english.txt;..\\objs\\strgen\\strgen.exe;%(AdditionalInputs) #2 ..\\bin\\lang\\"$i".lng;%(Outputs) -#2 " +#2 +#3 +#3 Translations +#3 " done eval "$2=\"\$RES\"" @@ -285,6 +292,7 @@ openttdvcxproj=`echo "$openttd" | grep "^#2" | sed "s~#2~~g"` openttd=`echo "$openttd" | grep "^#1" | sed "s~#1~~g"` load_lang_data "$ROOT_DIR/src/lang/*.txt" lang +langfiles=`echo "$lang" | grep "^#3" | sed "s~#3~~g"` langvcxproj=`echo "$lang" | grep "^#2" | sed "s~#2~~g"` lang=`echo "$lang" | grep "^#1" | sed "s~#1~~g"` @@ -301,6 +309,7 @@ generate "$openttdfiles" "openttd_vs100.vcxproj.filters" "$openttdfilters" generate "$lang" "langs_vs80.vcproj" generate "$lang" "langs_vs90.vcproj" generate "$langvcxproj" "langs_vs100.vcxproj" +generate "$langfiles" "langs_vs100.vcxproj.filters" generate "$settings" "settings_vs80.vcproj" "$settingscommand" generate "$settings" "settings_vs90.vcproj" "$settingscommand" generate "$settingsvcxproj" "settings_vs100.vcxproj" "$settingscommand" diff --git a/projects/generate.vbs b/projects/generate.vbs index 794ac6e62b..87c27ab387 100755 --- a/projects/generate.vbs +++ b/projects/generate.vbs @@ -232,36 +232,37 @@ Function load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files) load_main_data = res End Function -Function load_lang_data(dir, ByRef vcxproj) +Function load_lang_data(dir, ByRef vcxproj, ByRef files) Dim res, folder, file, first_time res = "" Set folder = FSO.GetFolder(dir) For Each file In folder.Files file = FSO.GetFileName(file) - If FSO.GetExtensionName(file) = "txt" Then + If file <> "english.txt" And FSO.GetExtensionName(file) = "txt" Then file = Left(file, Len(file) - 4) - if first_time <> 0 Then + If first_time <> 0 Then res = res & vbCrLf vcxproj = vcxproj & vbCrLf + files = files & vbCrLf Else first_time = 1 End If res = res & _ - " " & vbCrLf & _ - " " & vbCrLf & _ - " " & vbCrLf & _ - " " & vbCrLf & _ - " " + " " & vbCrLf & _ + " " & vbCrLf & _ + " " & vbCrLf & _ + " " vcxproj = vcxproj & _ " " & vbCrLf & _ " Generating " & file & " language file" & vbCrLf & _ @@ -269,6 +270,10 @@ Function load_lang_data(dir, ByRef vcxproj) " ..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)" & vbCrLf & _ " ..\bin\lang\" & file & ".lng;%(Outputs)" & vbCrLf & _ " " + files = files & _ + " " & vbCrLf & _ + " Translations" & vbCrLf & _ + " " End If Next load_lang_data = res @@ -364,11 +369,12 @@ generate openttd, ROOT_DIR & "/projects/openttd_vs90.vcproj", Null generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs100.vcxproj", Null generate openttdfiles, ROOT_DIR & "/projects/openttd_vs100.vcxproj.filters", openttdfilters -Dim lang, langvcxproj -lang = load_lang_data(ROOT_DIR & "/src/lang", langvcxproj) +Dim lang, langvcxproj, langfiles +lang = load_lang_data(ROOT_DIR & "/src/lang", langvcxproj, langfiles) generate lang, ROOT_DIR & "/projects/langs_vs80.vcproj", Null generate lang, ROOT_DIR & "/projects/langs_vs90.vcproj", Null generate langvcxproj, ROOT_DIR & "/projects/langs_vs100.vcxproj", Null +generate langfiles, ROOT_DIR & "/projects/langs_vs100.vcxproj.filters", Null Dim settings, settingsvcxproj, settingscommand, settingsfiles settings = load_settings_data(ROOT_DIR & "/src/table", settingsvcxproj, settingscommand, settingsfiles) diff --git a/projects/langs_vs100.vcxproj b/projects/langs_vs100.vcxproj index 1117b917cc..811ec025bd 100644 --- a/projects/langs_vs100.vcxproj +++ b/projects/langs_vs100.vcxproj @@ -41,6 +41,12 @@ + + Generating english language file + ..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)" + ..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs) + ..\bin\lang\english.lng;%(Outputs) + Generating afrikaans language file ..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)" @@ -101,12 +107,6 @@ ..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs) ..\bin\lang\dutch.lng;%(Outputs) - - Generating english language file - ..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)" - ..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs) - ..\bin\lang\english.lng;%(Outputs) - Generating english_US language file ..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)" diff --git a/projects/langs_vs100.vcxproj.filters b/projects/langs_vs100.vcxproj.filters new file mode 100644 index 0000000000..dc40560223 --- /dev/null +++ b/projects/langs_vs100.vcxproj.filters @@ -0,0 +1,152 @@ + + + + + {2a164580-9033-4a01-974b-b21da507efda} + + + + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + Translations + + + diff --git a/projects/langs_vs100.vcxproj.filters.in b/projects/langs_vs100.vcxproj.filters.in new file mode 100644 index 0000000000..0d60ee9595 --- /dev/null +++ b/projects/langs_vs100.vcxproj.filters.in @@ -0,0 +1,12 @@ + + + + + {2a164580-9033-4a01-974b-b21da507efda} + + + + +!!FILES!! + + diff --git a/projects/langs_vs100.vcxproj.in b/projects/langs_vs100.vcxproj.in index f1390468b6..5bfec8bf0f 100644 --- a/projects/langs_vs100.vcxproj.in +++ b/projects/langs_vs100.vcxproj.in @@ -41,6 +41,12 @@ + + Generating english language file + ..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)" + ..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs) + ..\bin\lang\english.lng;%(Outputs) + !!FILES!! diff --git a/projects/langs_vs80.vcproj b/projects/langs_vs80.vcproj index 27456242e2..9b27f1e786 100644 --- a/projects/langs_vs80.vcproj +++ b/projects/langs_vs80.vcproj @@ -45,156 +45,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -210,561 +60,715 @@ /> - - - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/langs_vs80.vcproj.in b/projects/langs_vs80.vcproj.in index 4bace433a8..548a0b0179 100644 --- a/projects/langs_vs80.vcproj.in +++ b/projects/langs_vs80.vcproj.in @@ -45,7 +45,26 @@ + + + + + + !!FILES!! + diff --git a/projects/langs_vs90.vcproj b/projects/langs_vs90.vcproj index 3c112d21bc..0062acbc71 100644 --- a/projects/langs_vs90.vcproj +++ b/projects/langs_vs90.vcproj @@ -46,156 +46,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -211,561 +61,715 @@ /> - - - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/langs_vs90.vcproj.in b/projects/langs_vs90.vcproj.in index b5cd43d44b..f03b231fc3 100644 --- a/projects/langs_vs90.vcproj.in +++ b/projects/langs_vs90.vcproj.in @@ -46,7 +46,26 @@ + + + + + + !!FILES!! +