diff --git a/examples/ademco/ademco.vcxproj b/examples/ademco/ademco.vcxproj new file mode 100644 index 0000000..0dfff2c --- /dev/null +++ b/examples/ademco/ademco.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {0757ea7c-9e3f-4f2f-8544-b1e649c9749a} + ademco + 10.0 + + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Level3 + true + WIN32;_DEBUG;ADEMCO_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + Windows + true + false + + + + + Level3 + true + true + true + WIN32;NDEBUG;ADEMCO_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + Windows + true + true + true + false + + + + + Level3 + true + _DEBUG;ADEMCO_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + Windows + true + false + + + + + Level3 + true + true + true + NDEBUG;ADEMCO_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + Windows + true + true + true + false + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/ademco/ademco.vcxproj.filters b/examples/ademco/ademco.vcxproj.filters new file mode 100644 index 0000000..30bd461 --- /dev/null +++ b/examples/ademco/ademco.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/examples/ademco/ademco.vcxproj.user b/examples/ademco/ademco.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/examples/ademco/ademco.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/examples/ademco/dllmain.cpp b/examples/ademco/dllmain.cpp new file mode 100644 index 0000000..ac75e5f --- /dev/null +++ b/examples/ademco/dllmain.cpp @@ -0,0 +1,22 @@ +// dllmain.cpp : Defines the entry point for the DLL application. + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +// Windows Header Files +#include + +BOOL APIENTRY DllMain( HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved + ) +{ + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + diff --git a/examples/examples.sln b/examples/examples.sln index 6e1ace3..b3cbc53 100644 --- a/examples/examples.sln +++ b/examples/examples.sln @@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server_demo", "server_demo\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen_event_md", "gen_event_md\gen_event_md.vcxproj", "{FED919A9-19E0-4D4A-972F-DDF537F5DEFE}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ademco", "ademco\ademco.vcxproj", "{0757EA7C-9E3F-4F2F-8544-B1E649C9749A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,6 +51,20 @@ Global {FED919A9-19E0-4D4A-972F-DDF537F5DEFE}.Release|x64.Build.0 = Release|x64 {FED919A9-19E0-4D4A-972F-DDF537F5DEFE}.Release|x86.ActiveCfg = Release|Win32 {FED919A9-19E0-4D4A-972F-DDF537F5DEFE}.Release|x86.Build.0 = Release|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Debug|ARM.ActiveCfg = Debug|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Debug|ARM64.ActiveCfg = Debug|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Debug|x64.ActiveCfg = Debug|x64 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Debug|x64.Build.0 = Debug|x64 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Debug|x86.ActiveCfg = Debug|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Debug|x86.Build.0 = Debug|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Release|Any CPU.ActiveCfg = Release|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Release|ARM.ActiveCfg = Release|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Release|ARM64.ActiveCfg = Release|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Release|x64.ActiveCfg = Release|x64 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Release|x64.Build.0 = Release|x64 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Release|x86.ActiveCfg = Release|Win32 + {0757EA7C-9E3F-4F2F-8544-B1E649C9749A}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/gen_event_md/gen_event_md.cpp b/examples/gen_event_md/gen_event_md.cpp index 9258865..736146f 100644 --- a/examples/gen_event_md/gen_event_md.cpp +++ b/examples/gen_event_md/gen_event_md.cpp @@ -1,4 +1,4 @@ -#include "../../c/ademco.h" +#include "../../ademco.h" #include #include #include diff --git a/tools/server_demo.bat b/tools/examples.bat similarity index 58% rename from tools/server_demo.bat rename to tools/examples.bat index 46ba769..5290834 100644 --- a/tools/server_demo.bat +++ b/tools/examples.bat @@ -1,3 +1,3 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" -devenv /Build "Release|x86" ../examples/examples.sln /project server_demo \ No newline at end of file +devenv /Build "Release|x86" ../examples/examples.sln \ No newline at end of file diff --git a/tools/server_demo_x64.bat b/tools/examples_x64.bat similarity index 58% rename from tools/server_demo_x64.bat rename to tools/examples_x64.bat index b5f0243..e910bf3 100644 --- a/tools/server_demo_x64.bat +++ b/tools/examples_x64.bat @@ -1,3 +1,3 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" -devenv /Build "Release|x64" ../examples/examples.sln /project server_demo \ No newline at end of file +devenv /Build "Release|x64" ../examples/examples.sln \ No newline at end of file diff --git a/tools/mkrelease.sh b/tools/mkrelease.sh index d316d4f..919415f 100755 --- a/tools/mkrelease.sh +++ b/tools/mkrelease.sh @@ -1,50 +1,59 @@ #!/bin/bash -# server-demo -# ./clean.sh -# ./server_demo.bat -# ./server_demo_x64.bat -# cp ../examples/Win32/Release/server_demo.exe . -# cp ../examples/x64/Release/server_demo_x64.exe . -# rm -f server_demo.zip -# zip server_demo.zip server_demo.exe server_demo_x64.exe -# rm -f server_demo.exe server_demo_x64.exe - +# examples +./clean.sh +./examples.bat +./examples_x64.bat +mkdir examples +mkdir examples/x86 +mkdir examples/x64 +cp "/e/dev/AlarmCenterTestTools/Release/直连型主机模拟器V1.13.exe" examples/x86/ +cp ../examples/Win32/Release/server_demo.exe examples/x86/ +cp ../examples/Release/ademco.dll examples/x86/ +cp ../examples/Release/ademco.lib examples/x86/ +cp ../examples/x64/Release/server_demo_x64.exe examples/x64/ +cp ../examples/x64/Release/ademco.dll examples/x64/ +cp ../examples/x64/Release/ademco.lib examples/x64/ +rm -f examples.zip +cd examples +zip -r ../examples.zip . * +cd .. +rm -rf examples # win-java -# ./clean.sh -# ./win_java.bat -# mkdir -p win_java -# cp -r ../swig/com/ win_java/ -# rm -f win_java/com/hb3344/ademco/*.class -# cp ../swig/*.java win_java/ -# cp ../swig/*.dll win_java/ -# rm -f win_java.zip -# cd win_java -# zip -r ../win_java.zip . * -# cd .. -# rm -rf win_java +./clean.sh +./win_java.bat +mkdir -p win_java +cp -r ../swig/com/ win_java/ +rm -f win_java/com/hb3344/ademco/*.class +cp ../swig/*.java win_java/ +cp ../swig/*.dll win_java/ +rm -f win_java.zip +cd win_java +zip -r ../win_java.zip . * +cd .. +rm -rf win_java # win-c# -# ./clean.sh -# ./win_csharp.bat -# mkdir -p win_csharp -# cp -r ../swig/com/ win_csharp/ -# cp ../swig/*.cs win_csharp/ -# cp ../swig/*.dll win_csharp/ -# cp ../swig/*.exe win_csharp/ -# rm -f win_csharp.zip -# cd win_csharp -# zip -r ../win_csharp.zip . * -# cd .. -# rm -rf win_csharp +./clean.sh +./win_csharp.bat +mkdir -p win_csharp +cp -r ../swig/com/ win_csharp/ +cp ../swig/*.cs win_csharp/ +cp ../swig/*.dll win_csharp/ +cp ../swig/*.exe win_csharp/ +rm -f win_csharp.zip +cd win_csharp +zip -r ../win_csharp.zip . * +cd .. +rm -rf win_csharp # ubuntu20.04 java -# ssh -t root@192.168.2.107 "cd /root/projects/ademco_hb && git reset --hard HEAD && git pull origin c && cd swig && export JAVA_HOME='/usr/lib/jvm/java-8-openjdk-amd64' && ./linux_java.sh && cd ../tools && ./linux_java.sh" -# scp root@192.168.2.107:/root/projects/ademco_hb/tools/linux_java.zip . -# ssh -t root@192.168.2.107 "rm -f /root/projects/ademco_hb/tools/linux_java.zip" +ssh -t root@192.168.2.107 "cd /root/projects/ademco_hb && git reset --hard HEAD && git pull origin c && cd swig && export JAVA_HOME='/usr/lib/jvm/java-8-openjdk-amd64' && ./linux_java.sh && cd ../tools && ./linux_java.sh" +scp root@192.168.2.107:/root/projects/ademco_hb/tools/linux_java.zip . +ssh -t root@192.168.2.107 "rm -f /root/projects/ademco_hb/tools/linux_java.zip" # macOS java ssh -t jack@wangjackdeMacBook-Pro "cd /Users/jack/projects/ademco_hb && git reset --hard HEAD && git pull origin c && cd swig && source ~/.zshrc && export JAVA_HOME='/Library/Java/JavaVirtualMachines/jdk-9.0.1.jdk/Contents/Home' && ./mac_java.sh && cd ../tools && ./mac_java.sh"