From 2dc4a05cf228f2f52d61283a12f111d1c514081d Mon Sep 17 00:00:00 2001 From: Laurentiu Date: Thu, 14 Mar 2024 12:43:50 +0200 Subject: [PATCH] fix setup for TCPServer/Tcpclient / update prebuild.sh to generate VersionInfo.cs file/ add in PreBuildEvent running of prebuild.sh --- AndroidLIB/prebuild.sh | 14 ++++++++------ AppServer/appConfig.ini | 2 -- AppServer/prebuild.sh | 14 ++++++++------ AppServerMobile/prebuild.sh | 14 ++++++++------ AppServerWatchDogService/Properties/VersionInfo.cs | 6 +++--- AppServerWatchDogService/prebuild.sh | 14 ++++++++------ AppWatchDog/prebuild.sh | 14 ++++++++------ CPlus_GW/prebuild.sh | 14 ++++++++------ Dongle RegLib/prebuild.sh | 14 ++++++++------ GatewayTetraVoice/prebuild.sh | 14 ++++++++------ LibrarySDR/LibrarySDR.csproj | 4 +++- LibrarySDR/prebuild.sh | 14 ++++++++------ MotoRepeaterCore/MotoRepeaterCore.csproj | 3 +++ MotoRepeaterCore/prebuild.sh | 14 ++++++++------ MotoTRBO_XNL_Cmd/MotoTRBO_XNL_Cmd.csproj | 4 +++- MotoTRBO_XNL_Cmd/prebuild.sh | 14 ++++++++------ MotoTrbo_GW/prebuild.sh | 14 ++++++++------ ReportsLibrary/ReportsLibrary.csproj | 3 +++ ReportsLibrary/prebuild.sh | 14 ++++++++------ SDRgateway/SDRgateway.csproj | 3 +-- SDRgateway/prebuild.sh | 14 ++++++++------ SafeMobileLIB_DLL/prebuild.sh | 14 ++++++++------ Safedispatch_4_0/config.ini | 3 +-- Safedispatch_4_0/prebuild.sh | 14 ++++++++------ Service Configurator/prebuild.sh | 14 ++++++++------ ServiceGatewaySDR/prebuild.sh | 14 ++++++++------ SetupCustomActions/prebuild.sh | 14 ++++++++------ SetupTCPClient/SetupTCPClient.vdproj | 6 +++--- SetupTCPServer/SetupTCPServer.vdproj | 6 +++--- SharedUI/Update/AutoUpdate.cs | 4 ++-- SharedUI/Update/UpdateForm.cs | 2 +- SipComponent/prebuild.sh | 14 ++++++++------ SocketIOComponent/prebuild.sh | 14 ++++++++------ SubscriberAndUserManager/prebuild.sh | 14 ++++++++------ TCPClientService/prebuild.sh | 14 ++++++++------ TCPServerService/prebuild.sh | 14 ++++++++------ Tetra_GW/prebuild.sh | 14 ++++++++------ 37 files changed, 226 insertions(+), 170 deletions(-) diff --git a/AndroidLIB/prebuild.sh b/AndroidLIB/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/AndroidLIB/prebuild.sh +++ b/AndroidLIB/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/AppServer/appConfig.ini b/AppServer/appConfig.ini index 3899e1c..9ea93b4 100644 --- a/AppServer/appConfig.ini +++ b/AppServer/appConfig.ini @@ -22,8 +22,6 @@ port = 17234 [Update] Version = 1.0.0.2 Enable = true -autoupdate = true -develop = true [Config] watchdog = false diff --git a/AppServer/prebuild.sh b/AppServer/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/AppServer/prebuild.sh +++ b/AppServer/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/AppServerMobile/prebuild.sh b/AppServerMobile/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/AppServerMobile/prebuild.sh +++ b/AppServerMobile/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/AppServerWatchDogService/Properties/VersionInfo.cs b/AppServerWatchDogService/Properties/VersionInfo.cs index f1d87f6..a2322ec 100644 --- a/AppServerWatchDogService/Properties/VersionInfo.cs +++ b/AppServerWatchDogService/Properties/VersionInfo.cs @@ -1,10 +1,10 @@ -// Generated on Wed, Feb 28, 2024 4:12:47 PM by prebuild script -namespace GenericBridge +// Generated on Thu, Feb 29, 2024 8:11:01 PM by prebuild script +namespace SafeDispatch-git { public class VersionInfo { - public string Version{ get; set; } = "8.1.0.10898-1-g07d6730"; + public string Version{ get; set; } = "8.1.0.10898-2-g741a923"; } } diff --git a/AppServerWatchDogService/prebuild.sh b/AppServerWatchDogService/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/AppServerWatchDogService/prebuild.sh +++ b/AppServerWatchDogService/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/AppWatchDog/prebuild.sh b/AppWatchDog/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/AppWatchDog/prebuild.sh +++ b/AppWatchDog/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/CPlus_GW/prebuild.sh b/CPlus_GW/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/CPlus_GW/prebuild.sh +++ b/CPlus_GW/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/Dongle RegLib/prebuild.sh b/Dongle RegLib/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/Dongle RegLib/prebuild.sh +++ b/Dongle RegLib/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/GatewayTetraVoice/prebuild.sh b/GatewayTetraVoice/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/GatewayTetraVoice/prebuild.sh +++ b/GatewayTetraVoice/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/LibrarySDR/LibrarySDR.csproj b/LibrarySDR/LibrarySDR.csproj index 94693fc..5cf5409 100644 --- a/LibrarySDR/LibrarySDR.csproj +++ b/LibrarySDR/LibrarySDR.csproj @@ -107,6 +107,9 @@ + + $(ProjectDir)prebuild.sh + - \ No newline at end of file diff --git a/LibrarySDR/prebuild.sh b/LibrarySDR/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/LibrarySDR/prebuild.sh +++ b/LibrarySDR/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/MotoRepeaterCore/MotoRepeaterCore.csproj b/MotoRepeaterCore/MotoRepeaterCore.csproj index 38d49ea..9873d3c 100644 --- a/MotoRepeaterCore/MotoRepeaterCore.csproj +++ b/MotoRepeaterCore/MotoRepeaterCore.csproj @@ -313,6 +313,9 @@ + + $(ProjectDir)prebuild.sh + \ No newline at end of file diff --git a/MotoRepeaterCore/prebuild.sh b/MotoRepeaterCore/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/MotoRepeaterCore/prebuild.sh +++ b/MotoRepeaterCore/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/MotoTRBO_XNL_Cmd/MotoTRBO_XNL_Cmd.csproj b/MotoTRBO_XNL_Cmd/MotoTRBO_XNL_Cmd.csproj index bd463ef..afa9c30 100644 --- a/MotoTRBO_XNL_Cmd/MotoTRBO_XNL_Cmd.csproj +++ b/MotoTRBO_XNL_Cmd/MotoTRBO_XNL_Cmd.csproj @@ -87,6 +87,9 @@ + + $(ProjectDir)prebuild.sh + - \ No newline at end of file diff --git a/MotoTRBO_XNL_Cmd/prebuild.sh b/MotoTRBO_XNL_Cmd/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/MotoTRBO_XNL_Cmd/prebuild.sh +++ b/MotoTRBO_XNL_Cmd/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/MotoTrbo_GW/prebuild.sh b/MotoTrbo_GW/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/MotoTrbo_GW/prebuild.sh +++ b/MotoTrbo_GW/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/ReportsLibrary/ReportsLibrary.csproj b/ReportsLibrary/ReportsLibrary.csproj index 8360229..600a1bc 100644 --- a/ReportsLibrary/ReportsLibrary.csproj +++ b/ReportsLibrary/ReportsLibrary.csproj @@ -1172,6 +1172,9 @@ + + $(ProjectDir)prebuild.sh + - - + $(ProjectDir)prebuild.sh \ No newline at end of file diff --git a/SDRgateway/prebuild.sh b/SDRgateway/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/SDRgateway/prebuild.sh +++ b/SDRgateway/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/SafeMobileLIB_DLL/prebuild.sh b/SafeMobileLIB_DLL/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/SafeMobileLIB_DLL/prebuild.sh +++ b/SafeMobileLIB_DLL/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/Safedispatch_4_0/config.ini b/Safedispatch_4_0/config.ini index c8be45a..4b59394 100644 --- a/Safedispatch_4_0/config.ini +++ b/Safedispatch_4_0/config.ini @@ -35,5 +35,4 @@ appServerPopUp = true [Update] Version = 1.0.0.2 Enable = true -autoupdate = true -develop = true + diff --git a/Safedispatch_4_0/prebuild.sh b/Safedispatch_4_0/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/Safedispatch_4_0/prebuild.sh +++ b/Safedispatch_4_0/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/Service Configurator/prebuild.sh b/Service Configurator/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/Service Configurator/prebuild.sh +++ b/Service Configurator/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/ServiceGatewaySDR/prebuild.sh b/ServiceGatewaySDR/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/ServiceGatewaySDR/prebuild.sh +++ b/ServiceGatewaySDR/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/SetupCustomActions/prebuild.sh b/SetupCustomActions/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/SetupCustomActions/prebuild.sh +++ b/SetupCustomActions/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/SetupTCPClient/SetupTCPClient.vdproj b/SetupTCPClient/SetupTCPClient.vdproj index a22699b..ab77ed2 100644 --- a/SetupTCPClient/SetupTCPClient.vdproj +++ b/SetupTCPClient/SetupTCPClient.vdproj @@ -357,7 +357,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -388,7 +388,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -501,7 +501,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } diff --git a/SetupTCPServer/SetupTCPServer.vdproj b/SetupTCPServer/SetupTCPServer.vdproj index c93d619..25d6b8d 100644 --- a/SetupTCPServer/SetupTCPServer.vdproj +++ b/SetupTCPServer/SetupTCPServer.vdproj @@ -363,7 +363,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -414,7 +414,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -527,7 +527,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } diff --git a/SharedUI/Update/AutoUpdate.cs b/SharedUI/Update/AutoUpdate.cs index 1da2c7f..7f33de9 100644 --- a/SharedUI/Update/AutoUpdate.cs +++ b/SharedUI/Update/AutoUpdate.cs @@ -90,8 +90,8 @@ namespace SharedUI public void CheckUpdate() { - Thread t = new Thread(CheckUpdateThread); - t.Start(); + //Thread t = new Thread(CheckUpdateThread); + //t.Start(); } diff --git a/SharedUI/Update/UpdateForm.cs b/SharedUI/Update/UpdateForm.cs index ebc276d..2a830b9 100644 --- a/SharedUI/Update/UpdateForm.cs +++ b/SharedUI/Update/UpdateForm.cs @@ -298,7 +298,7 @@ namespace SharedUI else UpdateUIForStatus(CurrentStatus.CHECKING); - updater.CheckUpdate(); + // updater.CheckUpdate(); } else { diff --git a/SipComponent/prebuild.sh b/SipComponent/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/SipComponent/prebuild.sh +++ b/SipComponent/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/SocketIOComponent/prebuild.sh b/SocketIOComponent/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/SocketIOComponent/prebuild.sh +++ b/SocketIOComponent/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/SubscriberAndUserManager/prebuild.sh b/SubscriberAndUserManager/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/SubscriberAndUserManager/prebuild.sh +++ b/SubscriberAndUserManager/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/TCPClientService/prebuild.sh b/TCPClientService/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/TCPClientService/prebuild.sh +++ b/TCPClientService/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/TCPServerService/prebuild.sh b/TCPServerService/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/TCPServerService/prebuild.sh +++ b/TCPServerService/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file diff --git a/Tetra_GW/prebuild.sh b/Tetra_GW/prebuild.sh index 72cb3c4..ce975f5 100644 --- a/Tetra_GW/prebuild.sh +++ b/Tetra_GW/prebuild.sh @@ -1,14 +1,14 @@ #/!bin/bash echo ................. - echo . Prebuild step . + echo . Prebuild step $(pwd) echo ................. version=$(git describe) # ( -# echo namespace GenericBridge +# echo namespace SafeDispatch-git # echo { # echo public class VersionInfo # echo { @@ -17,11 +17,13 @@ version=$(git describe) # echo } # )> "$(ProjectDir)\Properties\VersionInfo.cs" -[ -f ../../Properties/VersionInfo.cs ] && rm ../../Properties/VersionInfo.cs -cat > ../../Properties/VersionInfo.cs << ENDOFFILE + + +[ -f ../../../Properties/VersionInfo.cs ] && rm ../../../Properties/VersionInfo.cs +cat > ../../../Properties/VersionInfo.cs << ENDOFFILE // Generated on $(date) by prebuild script -namespace GenericBridge +namespace SafeDispatch-git { public class VersionInfo { @@ -32,6 +34,6 @@ namespace GenericBridge ENDOFFILE echo Generated 'Properties/VersionInfo.cs' with the content below: -cat ../../Properties/VersionInfo.cs +cat ../../../Properties/VersionInfo.cs echo ............................ #read -p 'Press Enter to continue...' var \ No newline at end of file