From 49967cb6101bc7e6593535d1c6fa293c8b26fa4a Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Sat, 2 May 2020 13:50:33 -0400 Subject: [PATCH] [builds] Clean up Windows CE project files. Remove version from filenames that caused a lot of polution in the release process. Use VERSIONINFO resource instead. * builds/wince/vc2005-ce/freetype.vcproj, builds/wince/vc2008-ce/freetype.vcproj, builds/windows/visualce/freetype.vcproj, builds/windows/visualce/freetype.dsp: s/2101//g, but add `ftver.rc'. * builds/wince/vc2008-ce/index.html, builds/wince/vc2005-ce/index.html, builds/windows/visualce/index.html: s/2101//g. --- ChangeLog | 15 ++++ builds/wince/vc2005-ce/freetype.vcproj | 80 +++++++++++---------- builds/wince/vc2005-ce/index.html | 8 +-- builds/wince/vc2008-ce/freetype.vcproj | 85 ++++++++++++---------- builds/wince/vc2008-ce/index.html | 8 +-- builds/windows/visualce/freetype.dsp | 28 +++++--- builds/windows/visualce/freetype.vcproj | 93 ++++++++++++++----------- builds/windows/visualce/index.html | 8 +-- 8 files changed, 185 insertions(+), 140 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43b6663d3..7a8e68048 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2020-05-02 Alexei Podtelezhnikov + + [builds] Clean up Windows CE project files. + + Remove version from filenames that caused a lot of polution in the + release process. Use VERSIONINFO resource instead. + + * builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2008-ce/freetype.vcproj, + builds/windows/visualce/freetype.vcproj, + builds/windows/visualce/freetype.dsp: s/2101//g, but add `ftver.rc'. + * builds/wince/vc2008-ce/index.html, + builds/wince/vc2005-ce/index.html, + builds/windows/visualce/index.html: s/2101//g. + 2020-05-01 Alexei Podtelezhnikov * devel/ft2build.h: Override FT_CONFIG_MODULES_H here as well. diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index de556aaf6..efdb58702 100644 --- a/builds/wince/vc2005-ce/freetype.vcproj +++ b/builds/wince/vc2005-ce/freetype.vcproj @@ -21,7 +21,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -501,7 +501,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -581,7 +581,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -641,7 +641,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -701,7 +701,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -741,7 +741,7 @@ - + @@ -758,7 +758,7 @@ - + @@ -868,6 +868,10 @@ + + + + diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index 16a10625d..8d52513ae 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -25,10 +25,10 @@ It compiles the following libraries from the FreeType 2.10.1 sources:

    -    freetype2101.lib     - release build; single threaded
-    freetype2101_D.lib   - debug build;   single threaded
-    freetype2101MT.lib   - release build; multi-threaded
-    freetype2101MT_D.lib - debug build;   multi-threaded
    + freetype.lib - release build; single threaded + freetype_D.lib - debug build; single threaded + freetypeMT.lib - release build; multi-threaded + freetypeMT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj index f9479daeb..d01c5b59f 100644 --- a/builds/wince/vc2008-ce/freetype.vcproj +++ b/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> + + + + diff --git a/builds/wince/vc2008-ce/index.html b/builds/wince/vc2008-ce/index.html index 9d71b09d4..303ee7762 100644 --- a/builds/wince/vc2008-ce/index.html +++ b/builds/wince/vc2008-ce/index.html @@ -25,10 +25,10 @@ It compiles the following libraries from the FreeType 2.10.1 sources:

    -    freetype2101.lib     - release build; single threaded
-    freetype2101_D.lib   - debug build;   single threaded
-    freetype2101MT.lib   - release build; multi-threaded
-    freetype2101MT_D.lib - debug build;   multi-threaded
    + freetype.lib - release build; single threaded + freetype_D.lib - debug build; single threaded + freetypeMT.lib - release build; multi-threaded + freetypeMT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp index cb1205d79..714c42257 100644 --- a/builds/windows/visualce/freetype.dsp +++ b/builds/windows/visualce/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype2101_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetypeMT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype2101.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetypeMT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2101.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype2101ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype.lib" +# ADD LIB32 /out:"..\..\..\objs\freetypeST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2101_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetypeST_D.lib" !ENDIF @@ -379,5 +379,13 @@ SOURCE=..\..\..\include\freetype\config\ftoption.h SOURCE=..\..\..\include\freetype\config\ftstdlib.h # End Source File # End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" +# Begin Source File + +SOURCE=..\..\..\src\base\ftver.rc +# End Source File +# End Group # End Target # End Project diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index 96b51e900..e271462bd 100644 --- a/builds/windows/visualce/freetype.vcproj +++ b/builds/windows/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> + + + + diff --git a/builds/windows/visualce/index.html b/builds/windows/visualce/index.html index 95e61fcf9..32bcd25ef 100644 --- a/builds/windows/visualce/index.html +++ b/builds/windows/visualce/index.html @@ -25,10 +25,10 @@ It compiles the following libraries from the FreeType 2.10.1 sources:

    -    freetype2101.lib     - release build; single threaded
-    freetype2101_D.lib   - debug build;   single threaded
-    freetype2101MT.lib   - release build; multi-threaded
-    freetype2101MT_D.lib - debug build;   multi-threaded
    + freetype.lib - release build; single threaded + freetype_D.lib - debug build; single threaded + freetypeMT.lib - release build; multi-threaded + freetypeMT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP