Subversion Repositories filter_foundry

Compare Revisions

Regard whitespace Rev 330 → Rev 331

/trunk/3264_mixer/foundry_3264_mixer.bat
2,13 → 2,53
 
cd /d %~dp0
 
rem copy /y ..\wpj\FilterFoundry.8bf in\
rem copy /y ..\visual_studio\FilterFoundry.8bf in\
rem copy /y ..\visual_studio\FilterFoundry64.8bf in\
rem Find 64 bit DLL
echo Collect 64 bit DLL...
if not exist ..\visual_studio\FilterFoundry64.8bf (
echo Can't mix in 64 bit because 64 bit DLL not found. Please compile it first
exit
)
echo Visual CPP =^> in\FilterFoundry64.8bf
copy /y ..\visual_studio\FilterFoundry64.8bf in\
 
rem Find 32 bit DLL
rem Check if WPJ or VCPP file is newer and choose this as source
echo Collect 32 bit DLL...
if not exist ..\visual_studio\FilterFoundry.8bf (
if not exist ..\wpj\FilterFoundry.8bf (
echo Can't mix in 32 bit because 32 bit DLL not found. Please compile it first
exit
)
)
copy /y ..\wpj\FilterFoundry.8bf in\FilterFoundry_wpj.8bf >NUL
copy /y ..\visual_studio\FilterFoundry.8bf in\FilterFoundry_vc.8bf >NUL
SET FILE1=in\FilterFoundry_wpj.8bf
SET FILE2=in\FilterFoundry_vc.8bf
FOR /F %%i IN ('DIR /B /O:D %FILE1% %FILE2%') DO SET NEWEST=%%i
if "%NEWEST%" == "FilterFoundry_wpj.8bf" (
echo OpenWatcom =^> in\FilterFoundry.8bf
move in\FilterFoundry_wpj.8bf in\FilterFoundry.8bf >NUL
del in\FilterFoundry_vc.8bf >NUL
 
echo Now start the mixer!
foundry_3264_mixer.exe
 
rem copy /y out\FilterFoundry.8bf ..\visual_studio\FilterFoundry.8bf
rem copy /y out\FilterFoundry64.8bf ..\visual_studio\FilterFoundry64.8bf
echo Copy back 32 bit to WPJ build dir, to enable debugging in IDE
copy /y out\FilterFoundry.8bf ..\wpj\FilterFoundry.8bf
echo Copy back 64 bit to VCPP build dir, to enable debugging in IDE
copy /y out\FilterFoundry64.8bf ..\visual_studio\FilterFoundry64.8bf
) else (
echo Visual CPP =^> in\FilterFoundry.8bf
move in\FilterFoundry_vc.8bf in\FilterFoundry.8bf >NUL
del in\FilterFoundry_wpj.8bf >NUL
 
pause.
echo Now start the mixer!
foundry_3264_mixer.exe
 
echo Copy back 32 bit to VCPP build dir, to enable debugging in IDE
copy /y out\FilterFoundry.8bf ..\visual_studio\FilterFoundry.8bf
echo Copy back 64 bit to VCPP build dir, to enable debugging in IDE
copy /y out\FilterFoundry64.8bf ..\visual_studio\FilterFoundry64.8bf
)
 
rem pause.
/trunk/RELEASE.md
0,0 → 1,20
 
ViaThinkSoft release procedure
------------------------------
 
1. Fix version information:
- version.h (3 times)
- manifest32.xml and manifest64.xml
- README.md
- CHANGELOG.md
2. Run visual_studio\vc_make_3264.bat . This creates a 32-bit DLL and a 64-bit DLL and mix them together.
3. Compile with OpenWatcom . This creates a 32-bit DLL only, and then mix Watcom-32-bit and VisualC-64-bit together. (This step is done because we want Win9x compatibility and therefore, the 32-bit 8BF must be built with OpenWatcom)
4. Commit to SVN with commit message "RELEASE 1.7.0.x"
5. Sync SVN with GitHub
6. Release a ZIP to viathinksoft.com with following contents:
wpj/FilterFoundry.8bf => FilterFoundry.8bf
visual_studio/FilterFoundry64.8bf => FilterFoundry64.8bf
README.md => README.txt
CHANGELOG.md => CHANGELOG.txt
doc\The Filter Foundry.pdf => The Filter Foundry.pdf
examples\ => examples\
/trunk/make_win.c
464,7 → 464,7
&& _UpdateResource(hupdate, RT_ICON, MAKEINTRESOURCE(1)/*Caution*/, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), NULL, 0) // clean up things we don't need in the standalone plugin
&& _UpdateResource(hupdate, RT_GROUP_CURSOR, MAKEINTRESOURCE(IDC_FF_HAND_QUESTION), MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), NULL, 0) // clean up things we don't need in the standalone plugin
&& _UpdateResource(hupdate, RT_CURSOR, MAKEINTRESOURCE(6)/*QuestionHand*/, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), NULL, 0) // clean up things we don't need in the standalone plugin
&& ((bits != 32) || _UpdateResource(hupdate, "DLL", "UNICOWS", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NULL, 0)) // clean up things we don't need in the standalone plugin
&& ((bits != 32) || _UpdateResource(hupdate, "DLL", "UNICOWS", MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), NULL, 0)) // clean up things we don't need in the standalone plugin
&& _UpdateResource(hupdate, "PIPL" /* note: caps!! */,MAKEINTRESOURCE(16000), MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),newpipl,(DWORD)piplsize)
&& _UpdateResource(hupdate, "AETE" /* note: caps!! */, MAKEINTRESOURCE(16000), MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), newaete, (DWORD)aetesize)
&& _UpdateResource(hupdate, RT_MANIFEST, MAKEINTRESOURCE(1), MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), newmanifest, (DWORD)manifestsize)
665,7 → 665,7
showmessage(_strdup("64 bit standalone filter was successfully created"));
}
else {
// Unicows.dll cannot edit resources of 64 bit DLLs.
// Unicows.dll cannot edit resources of 64 bit DLLs. (Tested with UnicoWS 1.1.3790.0)
// The normal Kernel function BeginUpdateResource can edit 64 bit DLLs, even in NT4.0 SP6
simplewarning(_strdup("Note: A 64 bit standalone filter cannot be created with your Windows version"));
}
/trunk/make_win.rc
19,6 → 19,6
*/
 
#ifndef _WIN64
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
UNICOWS DLL "UNICOWS.dll"
#endif
/trunk/visual_studio/FilterFoundry.vcxproj
78,6 → 78,7
<OutDir>.\</OutDir>
<IntDir>.\</IntDir>
<PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
<PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
<EmbedManifest>false</EmbedManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
87,6 → 88,7
<OutDir>.\</OutDir>
<TargetName>$(ProjectName)64</TargetName>
<PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
<PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
<EmbedManifest>false</EmbedManifest>
<IntDir>.\</IntDir>
</PropertyGroup>
97,6 → 99,7
<OutDir>.\</OutDir>
<IntDir>.\</IntDir>
<PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
<PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
<EmbedManifest>false</EmbedManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
106,6 → 109,7
<OutDir>.\</OutDir>
<TargetName>$(ProjectName)64</TargetName>
<PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
<PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
<EmbedManifest>false</EmbedManifest>
<IntDir>.\</IntDir>
</PropertyGroup>
134,6 → 138,12
win_flex_bison\win_flex.exe --never-interactive lexer.l y.tab.c
move lex.yy.c lex_yy.c</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>cd ..
cd 3264_mixer
foundry_3264_mixer.bat
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
160,6 → 170,12
win_flex_bison\win_flex.exe --never-interactive lexer.l y.tab.c
move lex.yy.c lex_yy.c</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>cd ..
cd 3264_mixer
foundry_3264_mixer.bat
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
190,6 → 206,12
win_flex_bison\win_flex.exe --never-interactive lexer.l y.tab.c
move lex.yy.c lex_yy.c</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>cd ..
cd 3264_mixer
foundry_3264_mixer.bat
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
220,6 → 242,12
win_flex_bison\win_flex.exe --never-interactive lexer.l y.tab.c
move lex.yy.c lex_yy.c</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>cd ..
cd 3264_mixer
foundry_3264_mixer.bat
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\c.h" />
/trunk/visual_studio/vc_make_3264.bat
21,7 → 21,7
 
echo Found Visual Studio Path %VCPATH%
 
cd "%~dp0"
cd /d "%~dp0"
 
echo Now build 32 Bit Plugin
call "%VCPATH%\vcvars32.bat"
33,5 → 33,11
nmake /f nmake64.mak clean
nmake /f nmake64.mak
 
echo Mix 32/64
cd ..\3264_mixer
call foundry_3264_mixer.bat
 
cd /d "%~dp0"
 
echo Finished. Please check console output.
pause.
/trunk/wpj/filterfoundry.wpj
4,10 → 4,10
VpeMain
1
WRect
518
512
 
7680
9713
9703
2
MProject
3
26,7 → 26,10
cd wpj
4
MCommand
 
56
cd ..\3264_mixer
call foundry_3264_mixer.bat
cd ..\wpj
1
5
WFileName
40,9 → 43,9
8
WRect
 
643
6674
6748
633
6668
6738
 
 
9