diff --git a/install/Windows/doc/AdapterConfigurationInstall.pptx b/install/Windows/doc/AdapterConfigurationInstall.pptx deleted file mode 100644 index a5e789958..000000000 Binary files a/install/Windows/doc/AdapterConfigurationInstall.pptx and /dev/null differ diff --git a/install/Windows/doc/AgentConfigurationInstall.pptx b/install/Windows/doc/AgentConfigurationInstall.pptx deleted file mode 100644 index 9c9ed6fe2..000000000 Binary files a/install/Windows/doc/AgentConfigurationInstall.pptx and /dev/null differ diff --git a/install/Windows/doc/MTConnectNSISInstall.docx b/install/Windows/doc/MTConnectNSISInstall.docx deleted file mode 100644 index 3af1ac8c3..000000000 Binary files a/install/Windows/doc/MTConnectNSISInstall.docx and /dev/null differ diff --git a/install/Windows/src/.gitattributes b/install/Windows/src/.gitattributes deleted file mode 100644 index 412eeda78..000000000 --- a/install/Windows/src/.gitattributes +++ /dev/null @@ -1,22 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/install/Windows/src/.gitignore b/install/Windows/src/.gitignore deleted file mode 100644 index 58bcbf82a..000000000 --- a/install/Windows/src/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear on external disk -.Spotlight-V100 -.Trashes - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk diff --git a/install/Windows/src/AdaptersConfiguration.exe b/install/Windows/src/AdaptersConfiguration.exe deleted file mode 100644 index 6fd6fb449..000000000 Binary files a/install/Windows/src/AdaptersConfiguration.exe and /dev/null differ diff --git a/install/Windows/src/AdaptersConfiguration.nsi b/install/Windows/src/AdaptersConfiguration.nsi deleted file mode 100644 index 70774c5a9..000000000 --- a/install/Windows/src/AdaptersConfiguration.nsi +++ /dev/null @@ -1,349 +0,0 @@ -; -; AdaptersConfiguration.nsi -; -; This script will install an MTConnect Agent that reads Adapter SHDR. -; It has uninstall support. -; - -; installer properties -;XPStyle on - -; The name of the installer -!define VERSION 1.0 - -Name "AdaptersConfiguration" -OutFile "AdaptersConfiguration.exe" -!include MUI2.nsh -!include x64.nsh -!include Sections.nsh -!include "logiclib.nsh" -!include FileFunc.nsh -!include NSISList.nsh - -ReserveFile "${NSISDIR}\Plugins\NSISList.dll" - -;; Custom pages -!include "MTCAdapterInstall.nsdinc" -!include "MTCAdapterSelection.nsdinc" - - -var AdapterPort -var AdapterName -var AdapterIP -var variable -var AdapterVendor -var i -var MachineType - - -brandingtext "MTConnect" -RequestExecutionLevel admin - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Images - icon and bmp - -; MUI Settings / Icons -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico" - -; MUI Settings / Header -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_RIGHT -!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\mtconnect.bmp" -!define MUI_HEADERIMAGE_UNBITMAP "${NSISDIR}\Contrib\Graphics\Header\mtconnect.bmp" -; MUI Settings / Wizard -!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange-uninstall.bmp" - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Pages - -;; Welcome Page -!define MUI_WELCOMEPAGE -!define MUI_WELCOMEPAGE_TITLE "Welcome to Adapter Configuration" -!insertmacro MUI_PAGE_WELCOME - -!define MUI_PAGE_HEADER_TEXT "MTConnect Adapter Configuration" - -Page custom fnc_MTCAdapterInstall_Show AdapterVendorPageLeave -;!insertmacro MUI_PAGE_CUSTOMFUNCTION_SHOW fnc_MTCAdapterInstall_Show - -Page custom fnc_MTCAdapterSelection_Show AdapterSelectionPageLeave -;!insertmacro MUI_PAGE_CUSTOMFUNCTION_SHOW fnc_MTCAdapterSelection_Show - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Languate specific -!insertmacro MUI_LANGUAGE English -LangString MyWelcomeTitle ${LANG_ENGLISH} "Welcome" - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function .onInit - ${List.Create} DevicesXmlList ; Create a list for Devices,Xml output - ${List.Create} AgentCfgList ; Create a liste for Agent.cfg output - - ;; Also http://nsis.sourceforge.net/Get_command_line_parameter_by_name - ;;MessageBox MB_OK "Value of CMDLINE is $CMDLINE" - ${GetOptions} $CMDLINE "/p" $variable - ;;MessageBox MB_OK "Value of CMDLINE parameter is '$variable'" - StrCpy $INSTDIR "$variable" - - ;; For standalone debugging - ;StrCpy $INSTDIR "$PROGRAMFILES64\MTConnect\MTConnectAgent" -FunctionEnd -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -Section "MTConnectAgent (required)" - - SectionIn RO - -SectionEnd -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -Section "Uninstall" -SectionEnd - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; StrReplace -;; ${StrReplace} "C:\my documents\" "\" "//" -;; MessageBox MB_OK $0 - -!define StrReplace '!insertmacro "_StrReplaceConstructor"' - -!macro _StrReplaceConstructor ORIGINAL_STRING TO_REPLACE REPLACE_BY - Push "${ORIGINAL_STRING}" - Push "${TO_REPLACE}" - Push "${REPLACE_BY}" - Call StrRep - Pop $0 -!macroend - -Function StrRep - Exch $R4 ; $R4 = Replacement String - Exch - Exch $R3 ; $R3 = String to replace (needle) - Exch 2 - Exch $R1 ; $R1 = String to do replacement in (haystack) - Push $R2 ; Replaced haystack - Push $R5 ; Len (needle) - Push $R6 ; len (haystack) - Push $R7 ; Scratch reg - StrCpy $R2 "" - StrLen $R5 $R3 - StrLen $R6 $R1 -loop: - StrCpy $R7 $R1 $R5 - StrCmp $R7 $R3 found - StrCpy $R7 $R1 1 ; - optimization can be removed if U know len needle=1 - StrCpy $R2 "$R2$R7" - StrCpy $R1 $R1 $R6 1 - StrCmp $R1 "" done loop -found: - StrCpy $R2 "$R2$R4" - StrCpy $R1 $R1 $R6 $R5 - StrCmp $R1 "" done loop -done: - StrCpy $R3 $R2 - Pop $R7 - Pop $R6 - Pop $R5 - Pop $R2 - Pop $R1 - Pop $R4 - Exch $R3 -FunctionEnd -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -!define GenerateDevicesXML '!insertmacro "_GenerateDevicesXML"' - -!macro _GenerateDevicesXML FILENAME DEVICENAME - Push "${FILENAME}" - Push "${DEVICENAME}" - Call FcnGenerateOneDevicesXML -!macroend - -Function FcnGenerateOneDevicesXML - Var /GLOBAL DeviceName - Var /GLOBAL FileTitle - Var /GLOBAL Line - Pop $DeviceName - Pop $FileTitle - FileOpen $4 "$INSTDIR\Devices\$AdapterVendor\$MachineType\$FileTitle.txt" r -Loop: - IfErrors done - - FileRead $4 $Line - DetailPrint $Line - - ${StrReplace} $Line "####" "$DeviceName" - StrCpy $Line $0 - ${StrReplace} $Line "NNNNNN" "$DeviceName" - StrCpy $Line $0 - - ${List.Add} DevicesXmlList $Line - - IfErrors 0 Loop - done: - FileClose $4 - FunctionEnd - -Function FcnGenerateAllDevicesXMLFile - - FileOpen $1 "$INSTDIR\Devices.xml" "w" - - FileWrite $1 "$\r$\n" - FileWrite $1 "$\r$\n"; - FileWrite $1 "
$\r$\n" - FileWrite $1 "$\r$\n" - - ${List.Count} $2 DevicesXmlList - IntOp $2 $2 - 1 - ${For} $i 0 $2 - ${List.Get} $3 DevicesXmlList $i - FileWrite $1 "$3" - ${Next} - - FileWrite $1 "$\r$\n" - FileWrite $1 "$\r$\n"; - - FileClose $1 - -FunctionEnd - - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function AdapterVendorPageLeave - ;Read Sheet values - ${NSD_GetText} $hCtl_MTCAdapterInstall_ComboBox2 $AdapterVendor - ${NSD_GetText} $hCtl_MTCAdapterInstall_ComboBox3 $MachineType - ;; MessageBox mb_ok "Vendor $AdapterVendor" -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function ConfigPreCreate - GetDlgItem $8 $HWNDPARENT 1 ; next, close == 1 - SendMessage $8 ${WM_SETTEXT} 0 "STR:&Done" - EnableWindow $8 1 - ShowWindow $8 1 - - GetDlgItem $8 $HWNDPARENT 2 ; cancel == 2 - SendMessage $8 ${WM_SETTEXT} 0 "STR:&Cancel" - EnableWindow $8 1 - ShowWindow $8 1 - - GetDlgItem $8 $HWNDPARENT 3 ; back==3 - SendMessage $8 ${WM_SETTEXT} 0 "STR:&Apply" - EnableWindow $8 1 - ShowWindow $8 1 - -FunctionEnd - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function FindDevicesFiles - ClearErrors - SendMessage $hCtl_MTCAdapterSelection_AdapterDropList ${CB_RESETCONTENT} 0 0 - - ; FindFirst var_handle_output var_filename_output filespec - FindFirst $R0 $R1 "$INSTDIR\Devices\$AdapterVendor\*.http" - ${StrReplace} $R1 ".http" "" - StrCpy $R1 $0 - ${StrReplace} $R1 "@" "/" - SendMessage $hCtl_MTCAdapterSelection_Link1 ${WM_SETTEXT} 0 "STR:$0" - - - ClearErrors - FindFirst $R0 $R1 "$INSTDIR\Devices\$AdapterVendor\$MachineType\*.txt" - ;MessageBox mb_ok "FindFirst $R1" - Loop_jobs: - IfErrors Loop_jobs_end - ${StrReplace} $R1 ".txt" "" - SendMessage $hCtl_MTCAdapterSelection_AdapterDropList ${CB_ADDSTRING} 0 "STR:$0"; "$R1" - FindNext $R0 $R1 - ;MessageBox mb_ok "FindNext $R1" - IfErrors 0 Loop_jobs - Loop_jobs_end: - -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function AddAdapterConfig - ;Read Textboxes values - ${NSD_GetText} $hCtl_MTCAdapterSelection_PortTextBox $AdapterPort ; adapter port, e.g., 7878 - ${NSD_GetText} $hCtl_MTCAdapterSelection_IPTextBox $AdapterIP ; adapter IPe.g., 127.0.0.1 - - ${NSD_GetText} $hCtl_MTCAdapterSelection_DeviceNameTextBox $AdapterName ; adaptername - - ${NSD_GetText} $hCtl_MTCAdapterSelection_AdapterDropList $6 ; cnc type general - ;MessageBox mb_ok "Selection $6" - - ;; This creates the agent.cfg entry - ${List.Add} AgentCfgList "$\t$AdapterName$\r$\n" - ${List.Add} AgentCfgList "$\t{$\r$\n" - ${List.Add} AgentCfgList "$\t$\tHost=$AdapterIP$\r$\n" - ${List.Add} AgentCfgList "$\t$\tPort=$AdapterPort$\r$\n" - ${List.Add} AgentCfgList "$\t$\tDeviceType=$6$\r$\n" - ${List.Add} AgentCfgList "$\t}$\r$\n" - - - ${GenerateDevicesXML} $6 $AdapterName - -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function AdapterSelectionPageLeave -; MessageBox mb_ok "AdapterConfigPageLeave" - Call AddAdapterConfig - Call FcnGenerateAllDevicesXMLFile - Call WriteAgentCfgFile -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function WriteAgentCfgFile - FileOpen $1 "$INSTDIR\Agent.cfg" "w" - ${List.Count} $2 AgentCfgList - IntOp $2 $2 - 1 - ${For} $i 0 $2 - ${List.Get} $3 AgentCfgList $i - FileWrite $1 "$3" - ${Next} - FileClose $1 -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function CustomButtonPushed ; back button of adapter config page - Call AddAdapterConfig - ;Call ResetAdapterConfig - ;Abort - StrCpy $R9 "2" ;Relative page number. See below. - Call RelGotoPage -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function .onGUIEnd - ${List.Unload} ; Don't forget to unload the NSISList plugin at the end !!!!! -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function RelGotoPage - IntCmp $R9 0 0 Move Move - StrCmp $R9 "X" 0 Move - StrCpy $R9 "120" - - Move: - SendMessage $HWNDPARENT "0x408" "$R9" "" -FunctionEnd - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function OnVendorUrlLinkClick - - ${NSD_GetText} $hCtl_MTCAdapterSelection_Link1 $0 - ExecShell "open" "$0" - -FunctionEnd - - \ No newline at end of file diff --git a/install/Windows/src/Agent.cfg b/install/Windows/src/Agent.cfg deleted file mode 100644 index c9dcc7c16..000000000 --- a/install/Windows/src/Agent.cfg +++ /dev/null @@ -1,14 +0,0 @@ -ServiceName = MTCAgent -Devices = Devices.xml -Port = 5010 -CheckpointFrequency=10000 -AllowPut=true -Adapters -{ -} -# Logger Configuration -logger_config -{ - logging_level = fatal - output = cout -} diff --git a/install/Windows/src/Agent.log b/install/Windows/src/Agent.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/install/Windows/src/Devices.xml b/install/Windows/src/Devices.xml deleted file mode 100644 index 5d7be08ad..000000000 --- a/install/Windows/src/Devices.xml +++ /dev/null @@ -1,68 +0,0 @@ - - -
- - - Siemens-840D - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install/Windows/src/Devices/Fanuc/MachineTool/5axisBC.txt b/install/Windows/src/Devices/Fanuc/MachineTool/5axisBC.txt deleted file mode 100644 index 4f33ddd32..000000000 --- a/install/Windows/src/Devices/Fanuc/MachineTool/5axisBC.txt +++ /dev/null @@ -1,68 +0,0 @@ - - Siemens-840D - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install/Windows/src/Devices/Fanuc/MachineTool/Faunc - CNC4axis.txt b/install/Windows/src/Devices/Fanuc/MachineTool/Faunc - CNC4axis.txt deleted file mode 100644 index af3e376ac..000000000 --- a/install/Windows/src/Devices/Fanuc/MachineTool/Faunc - CNC4axis.txt +++ /dev/null @@ -1,100 +0,0 @@ - - Fanuc - CNC4axis - - - - - - - - - - - - - - - - - SPINDLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INDEX - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install/Windows/src/Devices/Fanuc/Robot/FANUC-Robot M16iB2.txt b/install/Windows/src/Devices/Fanuc/Robot/FANUC-Robot M16iB2.txt deleted file mode 100644 index 1138e00f9..000000000 --- a/install/Windows/src/Devices/Fanuc/Robot/FANUC-Robot M16iB2.txt +++ /dev/null @@ -1,52 +0,0 @@ - - FANUC-Robot M16iB2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install/Windows/src/Devices/Generic/Command.txt b/install/Windows/src/Devices/Generic/Command.txt deleted file mode 100644 index 34b1de00d..000000000 --- a/install/Windows/src/Devices/Generic/Command.txt +++ /dev/null @@ -1,26 +0,0 @@ - - PCDMIS 2010 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install/Windows/src/Devices/Generic/Generic.txt b/install/Windows/src/Devices/Generic/Generic.txt deleted file mode 100644 index 42db3de43..000000000 --- a/install/Windows/src/Devices/Generic/Generic.txt +++ /dev/null @@ -1,51 +0,0 @@ - - Generic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install/Windows/src/Devices/Generic/PCDMIS-V2010.txt b/install/Windows/src/Devices/Generic/PCDMIS-V2010.txt deleted file mode 100644 index fb243e5d5..000000000 --- a/install/Windows/src/Devices/Generic/PCDMIS-V2010.txt +++ /dev/null @@ -1,60 +0,0 @@ - - PCDMIS-V2010 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/install/Windows/src/Devices/Mazak/MachineTool/Mazak - INT-Series.txt b/install/Windows/src/Devices/Mazak/MachineTool/Mazak - INT-Series.txt deleted file mode 100644 index 339026008..000000000 --- a/install/Windows/src/Devices/Mazak/MachineTool/Mazak - INT-Series.txt +++ /dev/null @@ -1,248 +0,0 @@ - - Mazak - INT-Series - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CONTOUR - INDEX - - - - - - - - - - - - - - - - - CONTOUR - SPINDLE - INDEX - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CONTOUR - SPINDLE - INDEX - - - - - - - - - - - - - - - - - - - CONTOUR - SPINDLE - INDEX - - - - - - - - - - - - - - - - - - - CONTOUR - SPINDLE - INDEX - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install/Windows/src/Devices/Mazak/MachineTool/Mazak - MTV-Series.txt b/install/Windows/src/Devices/Mazak/MachineTool/Mazak - MTV-Series.txt deleted file mode 100644 index 053ca40f6..000000000 --- a/install/Windows/src/Devices/Mazak/MachineTool/Mazak - MTV-Series.txt +++ /dev/null @@ -1,133 +0,0 @@ - - Mazak - MTV-Series - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SPINDLE - INDEX - - - - - - - - - - - - - - - INDEX - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install/Windows/src/Devices/Mazak/www.mazakusa.com@machines@mtconnect.http b/install/Windows/src/Devices/Mazak/www.mazakusa.com@machines@mtconnect.http deleted file mode 100644 index e69de29bb..000000000 diff --git a/install/Windows/src/Devices/Siemens/MachineTool/Siemens-840D.txt b/install/Windows/src/Devices/Siemens/MachineTool/Siemens-840D.txt deleted file mode 100644 index b086fc76e..000000000 --- a/install/Windows/src/Devices/Siemens/MachineTool/Siemens-840D.txt +++ /dev/null @@ -1,58 +0,0 @@ - - Siemens-840D - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install/Windows/src/Install.vbs b/install/Windows/src/Install.vbs deleted file mode 100644 index b3354cb83..000000000 --- a/install/Windows/src/Install.vbs +++ /dev/null @@ -1,19 +0,0 @@ -dim currentDirectory,WshShell - -' Trick to elevate UAC from http://www.winhelponline.com/articles/185/1/VBScripts-and-UAC-elevation.html -If WScript.Arguments.length =0 Then - Set objShell = CreateObject("Shell.Application") - 'Pass a bogus argument with leading blank space, say [ uac] - objShell.ShellExecute "wscript.exe", Chr(34) & _ - WScript.ScriptFullName & Chr(34) & " uac", "", "runas", 1 -Else - 'Add your code here - -currentDirectory = left(WScript.ScriptFullName,(Len(WScript.ScriptFullName))-(len(WScript.ScriptName))) - -Set WshShell = WScript.CreateObject("WScript.Shell") -'WshShell.Run "cmd /k " & Chr(34) & currentDirectory & "agent.exe" & Chr(34) & " install" , 1, TRUE -WshShell.Run Chr(34) & currentDirectory & "agent.exe" & Chr(34) & " install" , 1, TRUE - -wscript.sleep 1000 -End if diff --git a/install/Windows/src/InstallMTConnectAgentShdrBackend.docx b/install/Windows/src/InstallMTConnectAgentShdrBackend.docx deleted file mode 100644 index 21280fd43..000000000 Binary files a/install/Windows/src/InstallMTConnectAgentShdrBackend.docx and /dev/null differ diff --git a/install/Windows/src/KillAgent.bat b/install/Windows/src/KillAgent.bat deleted file mode 100644 index a03a25289..000000000 --- a/install/Windows/src/KillAgent.bat +++ /dev/null @@ -1,3 +0,0 @@ -taskkill.exe /im MTConnectAgentFromShdr.exe -pause - diff --git a/install/Windows/src/MTCAdapterInstall.nsddef b/install/Windows/src/MTCAdapterInstall.nsddef deleted file mode 100644 index 260d37002..000000000 --- a/install/Windows/src/MTCAdapterInstall.nsddef +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/install/Windows/src/MTCAdapterInstall.nsdinc b/install/Windows/src/MTCAdapterInstall.nsdinc deleted file mode 100644 index e73f9cf0e..000000000 --- a/install/Windows/src/MTCAdapterInstall.nsdinc +++ /dev/null @@ -1,85 +0,0 @@ -; ========================================================= -; This file was generated by NSISDialogDesigner 1.3.1.0 -; http://coolsoft.altervista.org/nsisdialogdesigner -; -; Do not edit it manually, use NSISDialogDesigner instead! -; ========================================================= - -; handle variables -Var hCtl_MTCAdapterInstall -Var hCtl_MTCAdapterInstall_GroupBox1 -Var hCtl_MTCAdapterInstall_Label3 -Var hCtl_MTCAdapterInstall_ComboBox4 -Var hCtl_MTCAdapterInstall_Label2 -Var hCtl_MTCAdapterInstall_ComboBox3 -Var hCtl_MTCAdapterInstall_ComboBox2 -Var hCtl_MTCAdapterInstall_Label1 -Var hCtl_MTCAdapterInstall_ComboBox1 - - -; dialog create function -Function fnc_MTCAdapterInstall_Create - - ; === MTCAdapterInstall (type: Dialog) === - nsDialogs::Create 1018 - Pop $hCtl_MTCAdapterInstall - ${If} $hCtl_MTCAdapterInstall == error - Abort - ${EndIf} - !insertmacro MUI_HEADER_TEXT "Machine Selection" "Choose from Available Vendors" - - ; === GroupBox1 (type: GroupBox) === - ${NSD_CreateGroupBox} 19.75u 3.69u 256.71u 104u "" - Pop $hCtl_MTCAdapterInstall_GroupBox1 - - ; === Label3 (type: Label) === - ${NSD_CreateLabel} 32.25u 74.46u 79.65u 8.62u "Version" - Pop $hCtl_MTCAdapterInstall_Label3 - - ; === ComboBox4 (type: ComboBox) === - ${NSD_CreateComboBox} 32.25u 84.92u 233.67u 12.92u "1.2" - Pop $hCtl_MTCAdapterInstall_ComboBox4 - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox4 "0.9" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox4 "1.0" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox4 "1.1" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox4 "1.2" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox4 "1.3" - ${NSD_CB_SelectString} $hCtl_MTCAdapterInstall_ComboBox4 "1.2" - - ; === Label2 (type: Label) === - ${NSD_CreateLabel} 32.25u 43.69u 75.04u 9.85u "Machine Type" - Pop $hCtl_MTCAdapterInstall_Label2 - - ; === ComboBox3 (type: ComboBox) === - ${NSD_CreateComboBox} 32.25u 53.54u 232.35u 12.92u "Machine Tool" - Pop $hCtl_MTCAdapterInstall_ComboBox3 - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox3 "MachineTool" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox3 "Turning" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox3 "Robot" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox3 "Misc" - - ; === ComboBox2 (type: ComboBox) === - ${NSD_CreateComboBox} 32.25u 27.08u 233.01u 12.92u "" - Pop $hCtl_MTCAdapterInstall_ComboBox2 - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox2 "Mazak" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox2 "Okuma" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox2 "Fanuc" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox2 "Siemens" - ${NSD_CB_AddString} $hCtl_MTCAdapterInstall_ComboBox2 "Generic" - - ; === Label1 (type: Label) === - ${NSD_CreateLabel} 32.25u 18.46u 48.05u 11.69u "Vendor" - Pop $hCtl_MTCAdapterInstall_Label1 - - ; === ComboBox1 (type: ComboBox) === - ${NSD_CreateComboBox} -283.7u 141.54u 192.2u 12.92u "" - Pop $hCtl_MTCAdapterInstall_ComboBox1 - -FunctionEnd - -; dialog show function -Function fnc_MTCAdapterInstall_Show - Call fnc_MTCAdapterInstall_Create - nsDialogs::Show $hCtl_MTCAdapterInstall -FunctionEnd - diff --git a/install/Windows/src/MTCAdapterSelection.nsddef b/install/Windows/src/MTCAdapterSelection.nsddef deleted file mode 100644 index 37b246f63..000000000 --- a/install/Windows/src/MTCAdapterSelection.nsddef +++ /dev/null @@ -1,21 +0,0 @@ - - - - Call ConfigPreCreate -Call FindDevicesFiles - - - - - \ No newline at end of file diff --git a/install/Windows/src/MTCAdapterSelection.nsdinc b/install/Windows/src/MTCAdapterSelection.nsdinc deleted file mode 100644 index 1dc904d75..000000000 --- a/install/Windows/src/MTCAdapterSelection.nsdinc +++ /dev/null @@ -1,88 +0,0 @@ -; ========================================================= -; This file was generated by NSISDialogDesigner 1.3.1.0 -; http://coolsoft.altervista.org/nsisdialogdesigner -; -; Do not edit it manually, use NSISDialogDesigner instead! -; ========================================================= - -; handle variables -Var hCtl_MTCAdapterSelection -Var hCtl_MTCAdapterSelection_GroupBox1 -Var hCtl_MTCAdapterSelection_Link1 -Var hCtl_MTCAdapterSelection_AdapterDropList -Var hCtl_MTCAdapterSelection_Label4 -Var hCtl_MTCAdapterSelection_DeviceNameTextBox -Var hCtl_MTCAdapterSelection_Label3 -Var hCtl_MTCAdapterSelection_PortTextBox -Var hCtl_MTCAdapterSelection_Label2 -Var hCtl_MTCAdapterSelection_IPTextBox -Var hCtl_MTCAdapterSelection_Label1 - - -; dialog create function -Function fnc_MTCAdapterSelection_Create - - ; === MTCAdapterSelection (type: Dialog) === - nsDialogs::Create 1018 - Pop $hCtl_MTCAdapterSelection - ${If} $hCtl_MTCAdapterSelection == error - Abort - ${EndIf} - !insertmacro MUI_HEADER_TEXT "Please Select Model" "Vendor Adapter Selection" - ${NSD_OnBack} CustomButtonPushed - - ; === GroupBox1 (type: GroupBox) === - ${NSD_CreateGroupBox} 11.85u 0.62u 265.92u 139.08u "" - Pop $hCtl_MTCAdapterSelection_GroupBox1 - ShowWindow $hCtl_MTCAdapterSelection_GroupBox1 ${SW_HIDE} - - ; === Link1 (type: Link) === - ${NSD_CreateLink} 23.7u 127.38u 175.09u 10.46u "Link1" - Pop $hCtl_MTCAdapterSelection_Link1 - ${NSD_OnClick} $hCtl_MTCAdapterSelection_Link1 OnVendorUrlLinkClick - - ; === AdapterDropList (type: DropList) === - ${NSD_CreateDropList} 25.01u 47.38u 238.28u 12.92u "" - Pop $hCtl_MTCAdapterSelection_AdapterDropList - - ; === Label4 (type: Label) === - ${NSD_CreateLabel} 23.04u 10.46u 65.82u 10.46u "Device Name" - Pop $hCtl_MTCAdapterSelection_Label4 - - ; === DeviceNameTextBox (type: Text) === - ${NSD_CreateText} 23.04u 22.77u 240.91u 12.31u "" - Pop $hCtl_MTCAdapterSelection_DeviceNameTextBox - - ; === Label3 (type: Label) === - ${NSD_CreateLabel} 23.04u 91.69u 65.82u 9.85u "Port" - Pop $hCtl_MTCAdapterSelection_Label3 - - ; === PortTextBox (type: Text) === - ${NSD_CreateText} 23.04u 103.38u 241.57u 12.31u "7878" - Pop $hCtl_MTCAdapterSelection_PortTextBox - - ; === Label2 (type: Label) === - ${NSD_CreateLabel} 23.7u 66.46u 93.47u 9.23u "IP" - Pop $hCtl_MTCAdapterSelection_Label2 - - ; === IPTextBox (type: Text) === - ${NSD_CreateText} 23.04u 77.54u 241.57u 12.31u "" - Pop $hCtl_MTCAdapterSelection_IPTextBox - - ; === Label1 (type: Label) === - ${NSD_CreateLabel} 23.04u 37.54u 153.37u 8.62u "Adapter Selection" - Pop $hCtl_MTCAdapterSelection_Label1 - - ; CreateFunctionCustomScript - Call ConfigPreCreate - Call FindDevicesFiles - - -FunctionEnd - -; dialog show function -Function fnc_MTCAdapterSelection_Show - Call fnc_MTCAdapterSelection_Create - nsDialogs::Show $hCtl_MTCAdapterSelection -FunctionEnd - diff --git a/install/Windows/src/MTCAgentConfig.nsddef b/install/Windows/src/MTCAgentConfig.nsddef deleted file mode 100644 index 53e884c79..000000000 --- a/install/Windows/src/MTCAgentConfig.nsddef +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/install/Windows/src/MTCAgentConfig.nsdinc b/install/Windows/src/MTCAgentConfig.nsdinc deleted file mode 100644 index 54e6fc550..000000000 --- a/install/Windows/src/MTCAgentConfig.nsdinc +++ /dev/null @@ -1,86 +0,0 @@ -; ========================================================= -; This file was generated by NSISDialogDesigner 1.3.1.0 -; http://coolsoft.altervista.org/nsisdialogdesigner -; -; Do not edit it manually, use NSISDialogDesigner instead! -; ========================================================= - -; handle variables -Var hCtl_MTCAgentConfig -Var hCtl_MTCAgentConfig_GroupBox1 -Var hCtl_MTCAgentConfig_Label1 -Var hCtl_MTCAgentConfig_DropList1 -Var hCtl_MTCAgentConfig_TextBox5 -Var hCtl_MTCAgentConfig_Label5 -Var hCtl_MTCAgentConfig_TextBox2 -Var hCtl_MTCAgentConfig_Label2 -Var hCtl_MTCAgentConfig_TextBox4 -Var hCtl_MTCAgentConfig_Label4 -Var hCtl_MTCAgentConfig_CheckBox2 - - -; dialog create function -Function fnc_MTCAgentConfig_Create - - ; === MTCAgentConfig (type: Dialog) === - nsDialogs::Create 1018 - Pop $hCtl_MTCAgentConfig - ${If} $hCtl_MTCAgentConfig == error - Abort - ${EndIf} - !insertmacro MUI_HEADER_TEXT "Agent Configuration" "Parameters" - - ; === GroupBox1 (type: GroupBox) === - ${NSD_CreateGroupBox} 4.61u 9.85u 227.09u 90.46u "" - Pop $hCtl_MTCAgentConfig_GroupBox1 - - ; === Label1 (type: Label) === - ${NSD_CreateLabel} 11.85u 73.85u 51.34u 12.92u "Debug Level" - Pop $hCtl_MTCAgentConfig_Label1 - - ; === DropList1 (type: DropList) === - ${NSD_CreateDropList} 71.09u 74.46u 144.15u 12.92u "Fatal" - Pop $hCtl_MTCAgentConfig_DropList1 - ${NSD_CB_AddString} $hCtl_MTCAgentConfig_DropList1 "Fatal" - ${NSD_CB_AddString} $hCtl_MTCAgentConfig_DropList1 "Warning" - ${NSD_CB_AddString} $hCtl_MTCAgentConfig_DropList1 "Info" - ${NSD_CB_AddString} $hCtl_MTCAgentConfig_DropList1 "Debug" - ${NSD_CB_SelectString} $hCtl_MTCAgentConfig_DropList1 "Fatal" - - ; === TextBox5 (type: Text) === - ${NSD_CreateText} 70.43u 58.46u 144.81u 12.31u "2" - Pop $hCtl_MTCAgentConfig_TextBox5 - - ; === Label5 (type: Label) === - ${NSD_CreateLabel} 17.11u 56.62u 46.73u 14.15u "Delay (sec)" - Pop $hCtl_MTCAgentConfig_Label5 - - ; === TextBox2 (type: Text) === - ${NSD_CreateText} 70.43u 40u 144.81u 12.31u "5000" - Pop $hCtl_MTCAgentConfig_TextBox2 - - ; === Label2 (type: Label) === - ${NSD_CreateLabel} 16.46u 38.77u 47.39u 13.54u "Http Port" - Pop $hCtl_MTCAgentConfig_Label2 - - ; === TextBox4 (type: Text) === - ${NSD_CreateText} 71.09u 22.77u 144.15u 12.31u " MTConnectAgent" - Pop $hCtl_MTCAgentConfig_TextBox4 - - ; === Label4 (type: Label) === - ${NSD_CreateLabel} 16.46u 22.77u 53.32u 12.31u "Service Name" - Pop $hCtl_MTCAgentConfig_Label4 - - ; === CheckBox2 (type: Checkbox) === - ${NSD_CreateCheckbox} 17.11u 108.31u 88.86u 12.92u "Start Agent Service" - Pop $hCtl_MTCAgentConfig_CheckBox2 - ${NSD_Check} $hCtl_MTCAgentConfig_CheckBox2 - -FunctionEnd - -; dialog show function -Function fnc_MTCAgentConfig_Show - Call fnc_MTCAgentConfig_Create - nsDialogs::Show $hCtl_MTCAgentConfig -FunctionEnd - diff --git a/install/Windows/src/MTConnectAgentInstall.nsi b/install/Windows/src/MTConnectAgentInstall.nsi deleted file mode 100644 index d86c8401a..000000000 --- a/install/Windows/src/MTConnectAgentInstall.nsi +++ /dev/null @@ -1,336 +0,0 @@ -; -; MTConnectAgent.nsi -; -; This script will install an MTConnect Agent that reads Adapter SHDR. -; It has uninstall support. -; - -; installer properties -;XPStyle on - -; The name of the installer -!define VERSION 1.2 - -Name "MTConnectAgentFromShdr${VERSION}" -OutFile "MTConnectAgentInstall${VERSION}.exe" - -!include MUI2.nsh -!include x64.nsh -!include Sections.nsh -!include "logiclib.nsh" - -!include "MTCAgentConfig.nsdinc" -!include NSISList.nsh - -ReserveFile "${NSISDIR}\Plugins\NSISList.dll" - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; CONFIGURATION variables -var ServiceName -var AgentPort -Var AgentDelay -var DebugType -var AgentserviceStart - - - -; Registry key to check for directory (so if you install again, it will -; overwrite the old one automatically) -;InstallDirRegKey HKLM "Software\MTConnectAgent32Bit${VERSION}" "$Install_Dir" - -AddBrandingImage right 100 -brandingtext "MTConnect" - -; Request application privileges for Windows Vista -RequestExecutionLevel admin - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Images - icon and bmp - -; MUI Settings / Icons -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico" - -; MUI Settings / Header -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_RIGHT -;!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\orange-r.bmp" -;!define MUI_HEADERIMAGE_UNBITMAP "${NSISDIR}\Contrib\Graphics\Header\orange-uninstall-r.bmp" -!define MUI_HEADERIMAGE_BITMAP "mtconnect.bmp" -!define MUI_HEADERIMAGE_UNBITMAP "mtconnect.bmp" - -; MUI Settings / Wizard -!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange-uninstall.bmp" - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Pages - -;Page custom fnc_MTConnectSplash_Show - -;; Welcome Page - -!define MUI_WELCOMEPAGE -!define MUI_WELCOMEPAGE_TITLE "$(MyWelcomeTitle)" -!insertmacro MUI_PAGE_WELCOME - -;!define MUI_HEADERIMAGE -;!define MUI_HEADERIMAGE_BITMAP "C:\Users\michalos\Documents\GitHub\MTConnectSolutions\MTConnectAgentFromShdr32Bit\DistributionX64\orange.bmp" -;!define MUI_HEADERIMAGE_RIGHT - - -;; LicensePage -!define MUI_PAGE_HEADER_TEXT "MTConnect Licensing" -!define MUI_PAGE_HEADER_SUBTEXT "Please Review" -!insertmacro MUI_PAGE_LICENSE "license.txt" - - -!define MUI_PAGE_HEADER_TEXT "MTConnect Destination" -!define MUI_DIRECTORYPAGE_TEXT_TOP "Please Choose MTConnect Agent Destination Folder" -!insertmacro MUI_PAGE_DIRECTORY - - ShowInstDetails show - -!define MUI_PAGE_HEADER_TEXT "MTConnect Agent Installation" -!define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "MTConnect Agent Installation Completed!" -!insertmacro MUI_PAGE_INSTFILES - - -Page custom fnc_MTCAgentConfig_Show AgentConfigPageLeave - -; Finish Page -!define MUI_PAGE_CUSTOMFUNCTION_SHOW finish_enter -!insertmacro MUI_PAGE_FINISH - -;UninstPage uninstConfirm -;UninstPage instfiles - -; Uninstaller Pages -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Languate specific -!insertmacro MUI_LANGUAGE English -LangString MyWelcomeTitle ${LANG_ENGLISH} "Welcome" - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function .onInit - ; The file to write - ; The default installation directory - ${If} ${RunningX64} - ;InstallDir $PROGRAMFILES64\MTConnect\MTConnectAgent - StrCpy $INSTDIR "$PROGRAMFILES64\MTConnect\MTConnectAgent" - ${Else} - ;InstallDir $PROGRAMFILES32\MTConnect\MTConnectAgent - StrCpy $INSTDIR "$PROGRAMFILES32\MTConnect\MTConnectAgent" - ${EndIf} - ${List.Create} AgentCfgList ; Create a liste for Agent.cfg output - -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function finish_enter - ;; insure back button not enables - GetDlGItem $0 $HWNDPARENT 3 - EnableWindow $0 0 -FunctionEnd - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; The stuff to install - -Section "MTConnectAgent (required)" - - SectionIn RO ;Section Index - If you specify RO as a parameter, then the section will be Read-Only, meaning it will always be set to install. - - ;SetBrandingImage /RESIZETOFIT "mtconnect.bmp" - - ; Set output path to the installation directory. - SetOutPath $INSTDIR - SetOverwrite on - ; Put files there - File "Agent.cfg" - File "Agent.log" - File "Devices.xml" - File "Install.bat" - File "KillAgent.bat" - File "license.txt" - File "MTConnectPage-1.4.vbs" - File "RunAgent.bat" - File "SetFilePermission.exe" - File "SuperUser.bat" - File "Uninstall.bat" - File "Uninstall.vbs" - File "AdaptersConfiguration.exe" - - ${If} ${RunningX64} - File "x64\agent.exe" - ;File "x64\vc2010redist_x64.exe" - ;ExecWait '$INSTDIR\vc2010redist_x64.exe' $0 - File "x64\msvcrt.dll" - File "x64\msvcr100.dll" - ${Else} - File "x32\agent.exe" - ;File "x32\vc2010redist_x86.exe" - ;ExecWait '$INSTDIR\vc2008redist_x86.exe' $0 - File "x32\msvcrt.dll" - File "x32\msvcr100.dll" - ${EndIf} - SetOutPath $INSTDIR\Devices - File /r "Devices\*.*" - - ExecWait '"$INSTDIR\SetFilePermission.exe" "$INSTDIR"' $0 - - ; Write the installation path into the registry - ;WriteRegStr HKLM SOFTWARE\NSIS_Example2 "Install_Dir" "$INSTDIR" - ;ReadINIStr $0 $INSTDIR\winamp.ini winamp outname - WriteUninstaller "uninstall.exe" - -SectionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Uninstaller - -Section "Uninstall" - - ; Remove registry keys - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MTConnectAgent${VERSION}" - DeleteRegKey HKLM SOFTWARE\MTConnectAgent${VERSION} - ExecWait '"sc.exe stop $ServiceName "' - ExecWait '"sc.exe delete $ServiceName "' - - ; Remove files and uninstaller - Delete "$INSTDIR\Agent.cfg" - Delete "$INSTDIR\Agent.exe" - Delete "$INSTDIR\Agent.log" - Delete "$INSTDIR\Devices.xml" - Delete "$INSTDIR\Install.bat" - Delete "$INSTDIR\KillAgent.bat" - Delete "$INSTDIR\License.txt" - Delete "$INSTDIR\MTConnectPage-1.4.vbs" - Delete "$INSTDIR\RunAgent.bat" - Delete "$INSTDIR\SetFilePermission.exe" - Delete "$INSTDIR\SuperUser.bat" - Delete "$INSTDIR\Uninstall.bat" - Delete "$INSTDIR\Uninstall.vbs" - Delete "$INSTDIR\AdaptersConfiguration.exe" - - Delete "$INSTDIR\msvcrt.dll" - Delete "$INSTDIR\msvcr100.dll" - - Delete $INSTDIR\uninstall.exe - - RMDir /r "$INSTDIR\Devices" - - ; Remove shortcuts, if any - ;Delete "$SMPROGRAMS\Example2\*.*" - - ; Remove directories used - ;RMDir "$SMPROGRAMS\Example2" - RMDir "$INSTDIR" - -SectionEnd -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -Function AdapterBuilder - Banner::show /set 76 "AdapterConfiguration" "Please wait" - ExecWait '"$INSTDIR\AdaptersConfiguration.exe" /p "$INSTDIR"' - Banner::destroy - -FunctionEnd - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -Function AgentConfigPageLeave - - ;Read Textboxes values - ${NSD_GetText} $hCtl_MTCAgentConfig_TextBox2 $AgentPort ; port - ${NSD_GetText} $hCtl_MTCAgentConfig_TextBox4 $ServiceName ; service name - ${NSD_GetText} $hCtl_MTCAgentConfig_TextBox5 $AgentDelay ; delay in seconds - ${NSD_LB_GetSelection} $hCtl_MTCAgentConfig_DropList1 $DebugType - - ;; Read Check box - ${NSD_GetState} $hCtl_MTCAgentConfig_CheckBox2 $AgentserviceStart - - ;; Sample string concatenation - strcpy $9 "000" - strcpy $4 "$4$9" - - ;; Sample debugging message box - ;MessageBox mb_ok $0 - ;MessageBox mb_ok $4 - - - ; Write the uninstall keys for Windows - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$ServiceName${VERSION}" "DisplayName" "MTConnectAgent${VERSION}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$ServiceName${VERSION}" "UninstallString" '"$INSTDIR\uninstall.exe"' - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$ServiceName${VERSION}" "NoModify" 1 - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$ServiceName${VERSION}" "NoRepair" 1 - - ; No adapters specified, use AgentBuilder instead - Call AdapterBuilder - ExecWait '"$INSTDIR\SetFilePermission.exe" "$INSTDIR\Devices.xml"' $0 - Call GenerateAgentCfg - - -FunctionEnd - - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -Function GenerateAgentCfg - Var /GLOBAL Line - - ClearErrors - GetTempFileName $R0 ; get new temp file name - FileOpen $1 $R0 "w" ; open temp file for writing - FileWrite $1 "ServiceName = $ServiceName$\r$\n" - FileWrite $1 "Devices = Devices.xml$\r$\n" - FileWrite $1 "Port = $AgentPort$\r$\n" - FileWrite $1 "CheckpointFrequency=10000$\r$\n" - FileWrite $1 "AllowPut=true$\r$\n" - FileWrite $1 "Adapters $\r$\n" - FileWrite $1 "{$\r$\n" - - FileOpen $4 "$INSTDIR\Agent.cfg" "r" - Loop: - IfErrors done - FileRead $4 $Line - IfErrors done - FileWrite $1 $Line - IfErrors 0 Loop - done: - FileClose $4 - FileWrite $1 "}$\r$\n" - FileWrite $1 "# Logger Configuration$\r$\n" - FileWrite $1 "logger_config$\r$\n" - FileWrite $1 "{$\r$\n" - FileWrite $1 " logging_level = $DebugType$\r$\n" - FileWrite $1 " output = cout$\r$\n" - FileWrite $1 "}$\r$\n" - - FileClose $1 ; close temp file - Delete "$INSTDIR\Agent.cfg" ; delete target file - CopyFiles /SILENT $R0 "$INSTDIR\Agent.cfg" ; copy temp file to target file - Delete $R0 - ExecWait '"$INSTDIR\SetFilePermission.exe" "$INSTDIR\Agent.cfg"' $0 -FunctionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function .onGUIEnd - - ;ExecWait 'sc.exe create $ServiceName start= auto binpath= "$INSTDIR\Agent.exe"' - ExecWait '"$INSTDIR\Agent.exe" install ' - ${If} $AgentserviceStart <> 0 - ;MessageBox mb_ok "sc.exe start $ServiceName" - ExecWait 'sc.exe start $ServiceName' $0 - ${EndIf} - - ${List.Unload} -FunctionEnd \ No newline at end of file diff --git a/install/Windows/src/MTConnectAgentInstall1.2.exe b/install/Windows/src/MTConnectAgentInstall1.2.exe deleted file mode 100644 index 6f905ca44..000000000 Binary files a/install/Windows/src/MTConnectAgentInstall1.2.exe and /dev/null differ diff --git a/install/Windows/src/MTConnectPage-1.4.vbs b/install/Windows/src/MTConnectPage-1.4.vbs deleted file mode 100644 index 508bf4752..000000000 --- a/install/Windows/src/MTConnectPage-1.4.vbs +++ /dev/null @@ -1,331 +0,0 @@ -' -' This software was developed by U.S. Government employees as part of -' their official duties and is not subject to copyright. No warranty implied -' or intended. -' -' Questions: john.michaloski@Nist.gov - -' GetElementById -' http://www.vistax64.com/vb-script/174625-editing-extended-active-directory-users-informations-vbscrip.html -' innerHTML is readonly for as pointed out here: http://msdn.microsoft.com/en-us/library/ms533897%28VS.85%29.aspx -' The property is read/write for all objects except the following, for which it is read-only: COL, COLGROUP, FRAMESET, HEAD, HTML, STYLE, TABLE, TBODY, TFOOT, THEAD, TITLE, TR. - - -' VBSCRIPT HELP: http://www.w3schools.com/vbScript/vbscript_ref_functions.asp -' http://msdn.microsoft.com/en-us/library/sx7b3k7y(VS.85).aspx -' XML HELP: http://www.devguru.com/Technologies/xmldom/quickref/xmldom_properties.html -'------------------------------------------------------------------------ -'Define Constants & Variables -'------------------------------------------------------------------------ -'BEGIN CALLOUT A -Option Explicit - -Dim strStatus, strPriority, strDueDate -Dim intRowCount : intRowCount = 2 -'END CALLOUT A - -Dim sleepamt,loopamt -Dim item - -Dim ie -Dim xmlDoc1 -Dim rootNode , nodes -dim i,j,k -dim html -dim table - -dim style -dim samples, events -dim sample, e, child -dim strComputer - - -sleepamt = 3000 -loopamt = 10000 - - - - -strComputer = Inputbox ("Machine that you would like monitor:", "Machine", "127.0.0.1:5000") -if strComputer = "" Then - Wscript.Quit(0) -End if - -Dim readings, readingKeys -Set readings = CreateObject("Scripting.Dictionary") - - -style= style & "P" & vbCrLf -style= style & "{" & vbCrLf -style= style & " FONT-FAMILY: ""Verdana"", sans-serif;" & vbCrLf -style= style & " FONT-SIZE: 70%;" & vbCrLf -style= style & " LINE-HEIGHT: 12pt;" & vbCrLf -style= style & " MARGIN-BOTTOM: 0px;" & vbCrLf -style= style & " MARGIN-LEFT: 10px;" & vbCrLf -style= style & " MARGIN-TOP: 10px" & vbCrLf -style= style & "}" & vbCrLf - -style= style & "H1" & vbCrLf -style= style & "{" & vbCrLf -style= style & " BACKGROUND-COLOR: #003366;" & vbCrLf -style= style & " BORDER-BOTTOM: #336699 6px solid;" & vbCrLf -style= style & " COLOR: #ffffff;" & vbCrLf -style= style & " FONT-SIZE: 130%;" & vbCrLf -style= style & " FONT-WEIGHT: normal;" & vbCrLf -style= style & " MARGIN: 0em 0em 0em -20px;" & vbCrLf -style= style & " PADDING-BOTTOM: 8px;" & vbCrLf -style= style & " PADDING-LEFT: 30px;" & vbCrLf -style= style & " PADDING-TOP: 16px" & vbCrLf -style= style & "}" & vbCrLf - -style= style & "table.gridtable {" & vbCrLf -style= style & " vertical-align: top;" & vbCrLf -style= style & " BACKGROUND-COLOR: #f0f0e0;" & vbCrLf -style= style & " BORDER-BOTTOM: #ffffff 0px solid;" & vbCrLf -style= style & " BORDER-COLLAPSE: collapse;" & vbCrLf -style= style & " BORDER-LEFT: #ffffff 0px solid;" & vbCrLf -style= style & " BORDER-RIGHT: #ffffff 0px solid;" & vbCrLf -style= style & " BORDER-TOP: #ffffff 0px solid;" & vbCrLf -style= style & " FONT-SIZE: 70%;" & vbCrLf -style= style & " MARGIN-LEFT: 10px" & vbCrLf -style= style & " }" & vbCrLf - -style= style & "td.gridtable {" & vbCrLf -style= style & " vertical-align: top;" & vbCrLf -style= style & " BACKGROUND-COLOR: #e7e7ce;" & vbCrLf -style= style & " BORDER-BOTTOM: #ffffff 1px solid;" & vbCrLf -style= style & " BORDER-LEFT: #ffffff 1px solid;" & vbCrLf -style= style & " BORDER-RIGHT: #ffffff 1px solid;" & vbCrLf -style= style & " BORDER-TOP: #ffffff 1px solid;" & vbCrLf -style= style & " PADDING-LEFT: 3px" & vbCrLf -style= style & " }" & vbCrLf - -style= style & "th.gridtable {" & vbCrLf -style= style & " vertical-align: top;" & vbCrLf -style= style & " BACKGROUND-COLOR: #cecf9c;" & vbCrLf -style= style & " BORDER-BOTTOM: #ffffff 1px solid;" & vbCrLf -style= style & " BORDER-LEFT: #ffffff 1px solid;" & vbCrLf -style= style & " BORDER-RIGHT: #ffffff 1px solid;" & vbCrLf -style= style & " BORDER-TOP: #ffffff 1px solid;" & vbCrLf -style= style & " COLOR: #000000;" & vbCrLf -style= style & " FONT-WEIGHT: bold" & vbCrLf -style= style & " }" & vbCrLf - -style= style & "tr.gridtable {" & vbCrLf -style= style & " vertical-align: top;" & vbCrLf -style= style & " }" & vbCrLf - -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -' http://support.microsoft.com/kb/246067 -' -Const dictKey = 1 -Const dictItem = 2 - -Function SortDictionary(objDict,intSort) - ' declare our variables - Dim strDict() - Dim objKey - Dim strKey,strItem - Dim X,Y,Z - - ' get the dictionary count - Z = objDict.Count - - ' we need more than one item to warrant sorting - If Z > 1 Then - ' create an array to store dictionary information - ReDim strDict(Z,2) - X = 0 - ' populate the string array - For Each objKey In objDict - strDict(X,dictKey) = CStr(objKey) - strDict(X,dictItem) = CStr(objDict(objKey)) - X = X + 1 - Next - - ' perform a a shell sort of the string array - For X = 0 to (Z - 2) - For Y = X to (Z - 1) - If StrComp(strDict(X,intSort),strDict(Y,intSort),vbTextCompare) > 0 Then - strKey = strDict(X,dictKey) - strItem = strDict(X,dictItem) - strDict(X,dictKey) = strDict(Y,dictKey) - strDict(X,dictItem) = strDict(Y,dictItem) - strDict(Y,dictKey) = strKey - strDict(Y,dictItem) = strItem - End If - Next - Next - - ' erase the contents of the dictionary object - objDict.RemoveAll - - ' repopulate the dictionary with the sorted information - For X = 0 to (Z - 1) - objDict.Add strDict(X,dictKey), strDict(X,dictItem) - Next - - End If - -End Function - - -' -' -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -function updatetable(machine) - On Error Resume Next - updatetable="" - xmlDoc1.Load("http://" & machine & "/current") - if( 0 <> Err.Number ) then - MsgBox "Either MTConnect not running or Internet Explorer Closed" - Wscript.Quit(0) - End if - - - Set rootNode = xmlDoc1.documentElement - updatetable = updatetable & "" - set nodes = rootNode.selectNodes("//DeviceStream") - k=0 - For Each item In nodes - - updatetable = updatetable & "" & vbCrLf - k=k+1 - if k>3 then - updatetable = updatetable & "" - k=0 - end if - Next - - updatetable = updatetable & "

" & item.attributes.getNamedItem("name").nodeValue - updatetable = updatetable & "" - readings.RemoveAll - - '''''''''''''''''''''''''''''''''''''''' - Set samples = item.SelectNodes(".//Samples") - For Each sample In samples - - For Each child In sample.ChildNodes - - If Not child.Attributes.getNamedItem("name") Is Nothing Then - readings.Add child.Attributes.getNamedItem("name").NodeValue, child.Text - Else - If Not child.Attributes.getNamedItem("dataItemId") Is Nothing Then - readings.Add child.Attributes.getNamedItem("dataItemId").NodeValue, child.Text - end if - End If - - Next - Next - - - Set events = item.SelectNodes(".//Events") - For Each e In events - - For Each child In e.ChildNodes - - If Not child.Attributes.getNamedItem("name") Is Nothing Then - readings.Add child.Attributes.getNamedItem("name").NodeValue, child.Text - Else - If Not child.Attributes.getNamedItem("dataItemId") Is Nothing Then - readings.Add child.Attributes.getNamedItem("dataItemId").NodeValue, child.Text - end if - End If - Next - Next - - Set events = item.SelectNodes(".//Condition") - For Each e In events - - For Each child In e.ChildNodes - - If Not child.Attributes.getNamedItem("name") Is Nothing Then - readings.Add child.Attributes.getNamedItem("name").NodeValue, child.nodeName & ":" & child.Text - Else - If Not child.Attributes.getNamedItem("dataItemId") Is Nothing Then - readings.Add child.Attributes.getNamedItem("dataItemId").NodeValue, child.nodeName & ":" & child.Text - end if - End If - Next - Next - - SortDictionary readings,1 - readingKeys = readings.Keys - for i = 0 to readings.Count -1 - updatetable = updatetable & "" - updatetable = updatetable & " " - updatetable = updatetable & " " - updatetable = updatetable & "" - - next - - updatetable = updatetable & "
" & readingKeys(i) & " " & readings.Item( readingKeys(i)) & "

" - -end function -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -sub SetDiv(id, str) - ie.Document.GetElementById(id).innerHtml = str -' if( 0 <> Err.Number ) then -' MsgBox "Bye" - ' Wscript.Quit(0) -' End If -End Sub -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Set ie = WScript.CreateObject("InternetExplorer.Application") - ie.visible = 1 ' keep visible - ie.navigate "about:blank" - ie.Document.Open - - - -Set xmlDoc1 = CreateObject("Msxml2.DOMDocument") -xmlDoc1.async = False -xmlDoc1.setProperty "ServerHTTPRequest", true -j=0 -i=2 -On Error Resume Next - -'for j = 0 to 1 - - -html = "" -ie.Document.write "" & vbCrLf -ie.Document.write " " & vbCrLf -ie.Document.write "" & vbCrLf -ie.Document.write "

MTConnect Readings

" & vbCrLf -ie.Document.write "
Loading...
" & vbCrLf -ie.Document.write "" & vbCrLf -ie.Document.write "" & vbCrLf - - -ie.Document.close - - - -Do While True - -'On Error Resume Next -table = "" -table = table & "

Current Readings " & CStr(j) & "
" -table = table & updatetable(strComputer) -table = table & "" - -SetDiv "Device", table - -j = j + 1 - -if ie.HWND = 0 then -'MsgBox "Bye" -Wscript.Quit(0) -end if - -Wscript.Sleep(sleepamt) - -Loop - - - - diff --git a/install/Windows/src/RunAgent.bat b/install/Windows/src/RunAgent.bat deleted file mode 100644 index 50eee4fad..000000000 --- a/install/Windows/src/RunAgent.bat +++ /dev/null @@ -1,3 +0,0 @@ -.\Agent.exe debug -pause - diff --git a/install/Windows/src/SetFilePermission.exe b/install/Windows/src/SetFilePermission.exe deleted file mode 100644 index 4e2851f88..000000000 Binary files a/install/Windows/src/SetFilePermission.exe and /dev/null differ diff --git a/install/Windows/src/Uninstall.bat b/install/Windows/src/Uninstall.bat deleted file mode 100644 index d8c058754..000000000 --- a/install/Windows/src/Uninstall.bat +++ /dev/null @@ -1,4 +0,0 @@ - -cd /d %~dp0 -.\Agent.exe remove - diff --git a/install/Windows/src/icon1.ico b/install/Windows/src/icon1.ico deleted file mode 100644 index e17467d2b..000000000 Binary files a/install/Windows/src/icon1.ico and /dev/null differ diff --git a/install/Windows/src/install.bat b/install/Windows/src/install.bat deleted file mode 100644 index 8bd52e729..000000000 --- a/install/Windows/src/install.bat +++ /dev/null @@ -1,5 +0,0 @@ -cd /d %~dp0 - -.\Agent.exe install - - diff --git a/install/Windows/src/license.txt b/install/Windows/src/license.txt deleted file mode 100644 index c31edbbee..000000000 --- a/install/Windows/src/license.txt +++ /dev/null @@ -1,11 +0,0 @@ -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. diff --git a/install/Windows/src/mtconnect.bmp b/install/Windows/src/mtconnect.bmp deleted file mode 100644 index 0bf4fb0a0..000000000 Binary files a/install/Windows/src/mtconnect.bmp and /dev/null differ diff --git a/install/Windows/src/orange-install.ico b/install/Windows/src/orange-install.ico deleted file mode 100644 index 1db75f8e4..000000000 Binary files a/install/Windows/src/orange-install.ico and /dev/null differ diff --git a/install/Windows/src/orange.bmp b/install/Windows/src/orange.bmp deleted file mode 100644 index 4ac1413b3..000000000 Binary files a/install/Windows/src/orange.bmp and /dev/null differ diff --git a/install/Windows/src/superuser.bat b/install/Windows/src/superuser.bat deleted file mode 100644 index 96ec3d1f6..000000000 --- a/install/Windows/src/superuser.bat +++ /dev/null @@ -1,5 +0,0 @@ -cd /d %~dp0 -icacls . /t /c /GRANT Everyone:F - - - diff --git a/install/Windows/src/todo.txt b/install/Windows/src/todo.txt deleted file mode 100644 index a99680c99..000000000 --- a/install/Windows/src/todo.txt +++ /dev/null @@ -1,10 +0,0 @@ -Todo: - -msvc dll install - silent? - -Devices.xml file generation -Device type menu generation - -11/4/2014 2:35:29 PM -* copy all Device templates in installation -* finished SetFilePermission \ No newline at end of file diff --git a/install/Windows/src/uninstall.vbs b/install/Windows/src/uninstall.vbs deleted file mode 100644 index 29fec30eb..000000000 --- a/install/Windows/src/uninstall.vbs +++ /dev/null @@ -1,25 +0,0 @@ - - -Dim strService, WshShell - -' Trick to elevate UAC from http://www.winhelponline.com/articles/185/1/VBScripts-and-UAC-elevation.html -If WScript.Arguments.length =0 Then - Set objShell = CreateObject("Shell.Application") - 'Pass a bogus argument with leading blank space, say [ uac] - objShell.ShellExecute "wscript.exe", Chr(34) & _ - WScript.ScriptFullName & Chr(34) & " uac", "", "runas", 1 -Else - 'Add your code here - - -strService = Inputbox ("Service that you would like to remove:", "Service", "MTConnectAgent") -if strService = "" Then - Wscript.Quit(0) -End if - -Set WshShell = WScript.CreateObject("WScript.Shell") -WshShell.Run "sc.exe stop" & strService - -WshShell.Run "sc.exe delete " & strService -wscript.sleep 1000 -End If \ No newline at end of file diff --git a/install/Windows/src/x32/Dbgview.exe b/install/Windows/src/x32/Dbgview.exe deleted file mode 100644 index 8d6c16dc0..000000000 Binary files a/install/Windows/src/x32/Dbgview.exe and /dev/null differ diff --git a/install/Windows/src/x32/GenerateVersioningDocument.exe b/install/Windows/src/x32/GenerateVersioningDocument.exe deleted file mode 100644 index d2c78c5ba..000000000 Binary files a/install/Windows/src/x32/GenerateVersioningDocument.exe and /dev/null differ diff --git a/install/Windows/src/x32/GenerateVersioningHtml.bat b/install/Windows/src/x32/GenerateVersioningHtml.bat deleted file mode 100644 index e6aa809a4..000000000 --- a/install/Windows/src/x32/GenerateVersioningHtml.bat +++ /dev/null @@ -1,5 +0,0 @@ - - -cd /d %~dp0 -.\GenerateVersioningDocument.exe %CD%\Agent.exe - diff --git a/install/Windows/src/x32/Versioning.htm b/install/Windows/src/x32/Versioning.htm deleted file mode 100644 index 477d02143..000000000 --- a/install/Windows/src/x32/Versioning.htm +++ /dev/null @@ -1,143 +0,0 @@ - -

MTConnect Agent
VERSION DESCRIPTION DOCUMENT

-
-RELEASE DATE: -2014-12-04 -

INTRODUCTION

PURPOSE

-This document describes the software configuration for the MTConnect Agent. The MTConnect Agent is based on C++ Open Source technology and is developed by the MTConnect Institute, but can be modified and redistributed by 3rd parties. The Agent software version -major, minor, revision, build - of the agent is ebmedded in the exe and is extracted and described in this document.

SCOPE

This document applies to the Product Acceptance Software of the Agent software. -The agent is installed as an exe with the install version number emebedded in the name. -The agent should install and run automatically (if installed correctly) as a Windows service. -In the task manager the agent.exe is the executable file to look for. -In the Windows Service Control Manager (SCM) the agent is launched automatically, and is given the service name on installation. -The default agent service name is 'MTConnectAgent'. -
If running correctly, using the configured combination http and port, the agent should display XML describing the device:
-
-http://127.0.0.1:5000/current
-

SECURITY REQUIREMENTS

-An administrator or equivalent must install and configure the agent. -

HARDWARE DESCRIPTION

-This agent distribution is PCs with 32 and 64 bit Microsoft Windows OS with Intel x86 chipsets. -This agent will need a Ethernet Network Adapter to communicate device data to clients and to communicate with device Adapters. -

SOFTWARE DESCRIPTION

-

SYSTEM SOFTWARE

-It has been validated to work on Windows 2000, XP and 7 platforms on Intel x86 chipsets. -Depending on the underlying architecture, either a 64 or 32 bit agent.exe will be installed. -
Windows NT and Linux require a different distribution. -

APPLICATION SOFTWARE

- - - -
Product NameSupplierVersion
MTConnect AgentMTConnect Institute
Mods NIST		1.3.0.6
- -

SOFTWARE SUPPORT INFORMATION

- See https://github.com/mtconnect/cppagent/blob/master/README.md for more documentation on MTConnect Agent. -

SOFTWARE DOCUMENTATION

-
  • Document Title MTConnect Standard
    • -
  • Vendor MTConnect Institute
    • -
  • Electronic Copy https://github.com/mtconnect/standard
    • -
  • Help/Bug/Issue https://github.com/mtconnect/cppagent/issues/new
    • -
-

SYSTEM SUPPORT DOCUMENTATION

-None. -

INSTALLAION SOFTWARE INFORMATION

-Note, the installation describes installation of the MTConnect Agent on a Windows platform only. It is assumed to be a Windows 2000, XP, or 7/8 installation. -It is known that this installation will not work on Windows NT system, and has not been tried on a Windows 95 or 98 or ME system. -Before you process, installation of the MTConnect Agent will require administrator priviledges on a Windows 7 platform. -
    -
  1. You will need to double click the agent install software, MTConnectAgentInstallxx.xx.exe, where xx.xx is the distributed version of the agent. - The installation uses the NSIS software package. NSIS stands for the Nullsoft Scriptable Install System (NSIS) and is a script-driven installation system for Microsoft Windows with minimal overhead backed by Nullsoft, the creators of Winamp. - NSIS is free software released under a combination of free software licenses, primarily the zlib license. -The Install is divided into Pages, with each Page either prompting the user for intput, or being informative, or both. -
  2. The first screen that will appear is a Welcome page. Click Next. At any time you can stop the install by clicking the Cancel button. -
  3. The second screen is the License Agreement page. This outlines the terms of agreement for using the software. -In effect there is no copyright. The License Agreement allows the right to distribute copies and modified versions of the Agent and but does NOT require that the same rights be preserved in modified versions of the work. -
  4. The third screen is the Installation Directory page. The user is prompted to select a installation directory. -The default directory is C:\Program Files\MTConnect\MTConnectAgent for either 32 or 64 bit installs. The Instsall program will determine the underlying architecture. -Note, unlike some application exe 32 bit agents will not run on 64 bit machines. - Two agents could be installed at the same time, as long as they have different service names and installation diretories. - The installation over an existing directory is not guaranteed to overwrite older versions (even though it should). -
  5. After the user clicks Next, the fourth page details the installation of all the file is done, but has not been configured. - Again, the installation program determines whether to use a 32 or 64 bit installation exe. -
  6. The fifth page prompts the user to configure the Agent specific parameters. -The User specifies service name, http port, delay, and debug level, which are agent specific parameters. -Note, You have the option of starting the agent service by checking the start agent checkbox. If this is your first agent installatino, it may be preferable to uncheck the box, and manually check the installation parameters. -The user clicks Next and now the adapter configuration installation will then be executed to configure the remaining portions of agent.cfg and devices.xml in the installation directory. -
  7. A flash screen alerts the user that the Adapter Wizard is going to run. -Now, adapters will be configured. Adapter configuration is a NSIS install program that DOES NO INSTALLING. Instead, it prompts the users to specify the set of Adatpers that provide SHDR input to the Agent, and then creates a Devices.xml file and the Adapter configuration part of the Agent.cfg file. - Advanced users should read https://github.com/mtconnect/adapter/blob/master/MTC_SHDR.docx for information on the SHDR protocol. Note, SHDR is not an MTConnect standard, but is widely used as a back-end for device communication. -
    1. A Welcome page offers the user a Adapter configuration greeting. Clicking Next is all that is needed. -
    2. The second Adapter configuration page, queries the user to select a vendor, machine type and version. -You must select an MTConnect to match your machine tool vendor CNC, and for which MTConnect templates are available. -Device descriptions are currently organized into MachineTools, Turning, or Robots. There are not many models, and it is unclear if this is the correct model for specifying MTConnect Adapters. -
    3. The next Adapter configuration screen asks the necessary information to configure an Adapter: Device Name, Type, IP and Port. -The manufacturer and model have already been selected. -When the users clicks Apply, an adapter.cfg entry and the devices.xml piece are saved, for later file writing. -The user clicks Apply button to save the configuration, and will take you back a slide to append a new adapter to your configuration. -The user clicks Done button completes the Adapter configuration process, writes the configuration files and returns to the Agent installation wizard. -
    -
  8. The final Agent installation page is the Finish Page, which signals the end of the installation process. -The user clicks Finish, and if the user selected start the agent, the agent service will be started. -
-There are several steps to insure that the Agent installed correctly. -
  1. First, you will need to double check that the MTConnectAgent installed correctly in the Windows Service Manager (SCM). - To check the service, right click ont he My Computer and select Manage. You may need to provide administrator credentials, so be prepared. -Assuming you can manage My Computer, double click 'Services and Applications' and then double click 'Services'. -At this point, you should see a list of all the services in your Windows platform. You will need to scroll down to the service name (or default name) provided during the Agent installation. -We will assume the default name, 'MTConnectAgent', and scroll down to this entry, double click the name and a dialog popup describing the service parameters should appear. -In the popup, you should be on 'General' tab and the see the following: -
      -
    1. Service Name should say MTConnectAgent (default) or the service name provided when installing the agent.
      2. -
    2. Startup type as automatic
      3. -
    3. Path to executable as (the default assuming you didnt change the install directory) C:\Program Files\MTConnect\MTConnectAgent\agent.exe -
    4. Service Status should be stopped. If you had checked the service startup it should say started. -
    5. The tabs Logon, Recovery and Dependencies can be ignored. -
    -
  2. If you see all the correct parameters, you can then start the Agent, by clicking the Start button. A popup dialog should appear and within a minute or so, the service should be started. -Close the Properties popup, and iF the agent status has not changed to 'Started' problems occured. -Assuming the Agent service started, you can now see XML data from your MTConnect Adapter(s) (really devices). -To see the output, open a web browser, (such as Internet Explorer), and type into the address bar: -
     http://127.0.0.1:5000/current
    -You should see data, as opposed to 'Unable to connect' or 'This page cannot be displayed' in the web browser. -If you dont see data the service is not running, or you configured the HTTP port in the agent to something besides 5000. -If you see data, but all the data is UNAVAILABLE, this is also most likely bad. -You see all UNAVAILABLE data either: -
      -
    1. No adapters were configured.
      2. -
    2. The adapters is down, and no data is available. To check this, telnet to ip/port of the adapter, you should see output.
      3. -
    3. The adapters data blocked by the firewall. Firewall can be on either the host or the remote adapter computer. To check this, telnet to ip/port of the adapter, you should see output. -If you see data, the firewall is most likely preventing the agent from remote access. -If you don't see data, (and you can 'ping' the remote computer, a firewall on the remote platform may be preventing an adapter from outputting SHDR to socket port 7878 (the default). -
    -
  3. If you see data, then the agent has installed and been configured correctly. Now, just monitor the agent for a couple days to insure that it is booting correctly and operating properly. -
-

UNINSTALLAION SOFTWARE INFORMATION

-There are two methods for uninstalling the Agent. Either use:
  1. The Microsoft Windows Control Panel, -or
  2. navigate to the install directory (default C:\Program Files\MTConnect\MTConnectAgent) and click uninstall.exe. -

The control panel uninstall procedure wil be described (although once the uninstall program is activated, the procedure is the same.) -

Uninstall uses the Windows mechanism: Start->Control Panale -> Programs and Features to fetch all the installed programs on the platform. -Scroll down and find the MTConnectAgentxx.xx installation. Double click uninstall, YOU WILL NEED TO HAVE ADMINISTRATOR priviledges to uninstall on windows 7 machines. -Three uninstall pages will diplay: Click Next, then Uninstall and finally Finish, and the Agent will be removed. -

Uninstalling using the control panel is preferrable, but often some quirks appear. It may be necessary to manually top the MTConnectAgent service before uninstalling. -Also, the Control Panel programs and features may not remove the MTConnectAgentxx.xx entry even though it has uninstalled the agent. A refresh may take care of this. diff --git a/install/Windows/src/x32/agent.exe b/install/Windows/src/x32/agent.exe deleted file mode 100644 index 36f62f2a9..000000000 Binary files a/install/Windows/src/x32/agent.exe and /dev/null differ diff --git a/install/Windows/src/x32/msvcr100.dll b/install/Windows/src/x32/msvcr100.dll deleted file mode 100644 index fd91c89d8..000000000 Binary files a/install/Windows/src/x32/msvcr100.dll and /dev/null differ diff --git a/install/Windows/src/x32/msvcrt.dll b/install/Windows/src/x32/msvcrt.dll deleted file mode 100644 index ed68df5f2..000000000 Binary files a/install/Windows/src/x32/msvcrt.dll and /dev/null differ diff --git a/install/Windows/src/x32/vc2010redist_x86.exe b/install/Windows/src/x32/vc2010redist_x86.exe deleted file mode 100644 index d81f3f5ab..000000000 Binary files a/install/Windows/src/x32/vc2010redist_x86.exe and /dev/null differ diff --git a/install/Windows/src/x64/Dbgview.exe b/install/Windows/src/x64/Dbgview.exe deleted file mode 100644 index 9e840761b..000000000 Binary files a/install/Windows/src/x64/Dbgview.exe and /dev/null differ diff --git a/install/Windows/src/x64/GenerateVersioningDocument.exe b/install/Windows/src/x64/GenerateVersioningDocument.exe deleted file mode 100644 index b1768081c..000000000 Binary files a/install/Windows/src/x64/GenerateVersioningDocument.exe and /dev/null differ diff --git a/install/Windows/src/x64/GenerateVersioningHtml.bat b/install/Windows/src/x64/GenerateVersioningHtml.bat deleted file mode 100644 index e6aa809a4..000000000 --- a/install/Windows/src/x64/GenerateVersioningHtml.bat +++ /dev/null @@ -1,5 +0,0 @@ - - -cd /d %~dp0 -.\GenerateVersioningDocument.exe %CD%\Agent.exe - diff --git a/install/Windows/src/x64/Versioning.htm b/install/Windows/src/x64/Versioning.htm deleted file mode 100644 index 477d02143..000000000 --- a/install/Windows/src/x64/Versioning.htm +++ /dev/null @@ -1,143 +0,0 @@ - -

MTConnect Agent
VERSION DESCRIPTION DOCUMENT

-
-RELEASE DATE: -2014-12-04 -

INTRODUCTION

PURPOSE

-This document describes the software configuration for the MTConnect Agent. The MTConnect Agent is based on C++ Open Source technology and is developed by the MTConnect Institute, but can be modified and redistributed by 3rd parties. The Agent software version -major, minor, revision, build - of the agent is ebmedded in the exe and is extracted and described in this document.

SCOPE

This document applies to the Product Acceptance Software of the Agent software. -The agent is installed as an exe with the install version number emebedded in the name. -The agent should install and run automatically (if installed correctly) as a Windows service. -In the task manager the agent.exe is the executable file to look for. -In the Windows Service Control Manager (SCM) the agent is launched automatically, and is given the service name on installation. -The default agent service name is 'MTConnectAgent'. -
If running correctly, using the configured combination http and port, the agent should display XML describing the device:
-
-http://127.0.0.1:5000/current
-

SECURITY REQUIREMENTS

-An administrator or equivalent must install and configure the agent. -

HARDWARE DESCRIPTION

-This agent distribution is PCs with 32 and 64 bit Microsoft Windows OS with Intel x86 chipsets. -This agent will need a Ethernet Network Adapter to communicate device data to clients and to communicate with device Adapters. -

SOFTWARE DESCRIPTION

-

SYSTEM SOFTWARE

-It has been validated to work on Windows 2000, XP and 7 platforms on Intel x86 chipsets. -Depending on the underlying architecture, either a 64 or 32 bit agent.exe will be installed. -
Windows NT and Linux require a different distribution. -

APPLICATION SOFTWARE

- - - -
Product NameSupplierVersion
MTConnect AgentMTConnect Institute
Mods NIST		1.3.0.6
- -

SOFTWARE SUPPORT INFORMATION

- See https://github.com/mtconnect/cppagent/blob/master/README.md for more documentation on MTConnect Agent. -

SOFTWARE DOCUMENTATION

-
  • Document Title MTConnect Standard
    • -
  • Vendor MTConnect Institute
    • -
  • Electronic Copy https://github.com/mtconnect/standard
    • -
  • Help/Bug/Issue https://github.com/mtconnect/cppagent/issues/new
    • -
-

SYSTEM SUPPORT DOCUMENTATION

-None. -

INSTALLAION SOFTWARE INFORMATION

-Note, the installation describes installation of the MTConnect Agent on a Windows platform only. It is assumed to be a Windows 2000, XP, or 7/8 installation. -It is known that this installation will not work on Windows NT system, and has not been tried on a Windows 95 or 98 or ME system. -Before you process, installation of the MTConnect Agent will require administrator priviledges on a Windows 7 platform. -
    -
  1. You will need to double click the agent install software, MTConnectAgentInstallxx.xx.exe, where xx.xx is the distributed version of the agent. - The installation uses the NSIS software package. NSIS stands for the Nullsoft Scriptable Install System (NSIS) and is a script-driven installation system for Microsoft Windows with minimal overhead backed by Nullsoft, the creators of Winamp. - NSIS is free software released under a combination of free software licenses, primarily the zlib license. -The Install is divided into Pages, with each Page either prompting the user for intput, or being informative, or both. -
  2. The first screen that will appear is a Welcome page. Click Next. At any time you can stop the install by clicking the Cancel button. -
  3. The second screen is the License Agreement page. This outlines the terms of agreement for using the software. -In effect there is no copyright. The License Agreement allows the right to distribute copies and modified versions of the Agent and but does NOT require that the same rights be preserved in modified versions of the work. -
  4. The third screen is the Installation Directory page. The user is prompted to select a installation directory. -The default directory is C:\Program Files\MTConnect\MTConnectAgent for either 32 or 64 bit installs. The Instsall program will determine the underlying architecture. -Note, unlike some application exe 32 bit agents will not run on 64 bit machines. - Two agents could be installed at the same time, as long as they have different service names and installation diretories. - The installation over an existing directory is not guaranteed to overwrite older versions (even though it should). -
  5. After the user clicks Next, the fourth page details the installation of all the file is done, but has not been configured. - Again, the installation program determines whether to use a 32 or 64 bit installation exe. -
  6. The fifth page prompts the user to configure the Agent specific parameters. -The User specifies service name, http port, delay, and debug level, which are agent specific parameters. -Note, You have the option of starting the agent service by checking the start agent checkbox. If this is your first agent installatino, it may be preferable to uncheck the box, and manually check the installation parameters. -The user clicks Next and now the adapter configuration installation will then be executed to configure the remaining portions of agent.cfg and devices.xml in the installation directory. -
  7. A flash screen alerts the user that the Adapter Wizard is going to run. -Now, adapters will be configured. Adapter configuration is a NSIS install program that DOES NO INSTALLING. Instead, it prompts the users to specify the set of Adatpers that provide SHDR input to the Agent, and then creates a Devices.xml file and the Adapter configuration part of the Agent.cfg file. - Advanced users should read https://github.com/mtconnect/adapter/blob/master/MTC_SHDR.docx for information on the SHDR protocol. Note, SHDR is not an MTConnect standard, but is widely used as a back-end for device communication. -
    1. A Welcome page offers the user a Adapter configuration greeting. Clicking Next is all that is needed. -
    2. The second Adapter configuration page, queries the user to select a vendor, machine type and version. -You must select an MTConnect to match your machine tool vendor CNC, and for which MTConnect templates are available. -Device descriptions are currently organized into MachineTools, Turning, or Robots. There are not many models, and it is unclear if this is the correct model for specifying MTConnect Adapters. -
    3. The next Adapter configuration screen asks the necessary information to configure an Adapter: Device Name, Type, IP and Port. -The manufacturer and model have already been selected. -When the users clicks Apply, an adapter.cfg entry and the devices.xml piece are saved, for later file writing. -The user clicks Apply button to save the configuration, and will take you back a slide to append a new adapter to your configuration. -The user clicks Done button completes the Adapter configuration process, writes the configuration files and returns to the Agent installation wizard. -
    -
  8. The final Agent installation page is the Finish Page, which signals the end of the installation process. -The user clicks Finish, and if the user selected start the agent, the agent service will be started. -
-There are several steps to insure that the Agent installed correctly. -
  1. First, you will need to double check that the MTConnectAgent installed correctly in the Windows Service Manager (SCM). - To check the service, right click ont he My Computer and select Manage. You may need to provide administrator credentials, so be prepared. -Assuming you can manage My Computer, double click 'Services and Applications' and then double click 'Services'. -At this point, you should see a list of all the services in your Windows platform. You will need to scroll down to the service name (or default name) provided during the Agent installation. -We will assume the default name, 'MTConnectAgent', and scroll down to this entry, double click the name and a dialog popup describing the service parameters should appear. -In the popup, you should be on 'General' tab and the see the following: -
      -
    1. Service Name should say MTConnectAgent (default) or the service name provided when installing the agent.
      2. -
    2. Startup type as automatic
      3. -
    3. Path to executable as (the default assuming you didnt change the install directory) C:\Program Files\MTConnect\MTConnectAgent\agent.exe -
    4. Service Status should be stopped. If you had checked the service startup it should say started. -
    5. The tabs Logon, Recovery and Dependencies can be ignored. -
    -
  2. If you see all the correct parameters, you can then start the Agent, by clicking the Start button. A popup dialog should appear and within a minute or so, the service should be started. -Close the Properties popup, and iF the agent status has not changed to 'Started' problems occured. -Assuming the Agent service started, you can now see XML data from your MTConnect Adapter(s) (really devices). -To see the output, open a web browser, (such as Internet Explorer), and type into the address bar: -
     http://127.0.0.1:5000/current
    -You should see data, as opposed to 'Unable to connect' or 'This page cannot be displayed' in the web browser. -If you dont see data the service is not running, or you configured the HTTP port in the agent to something besides 5000. -If you see data, but all the data is UNAVAILABLE, this is also most likely bad. -You see all UNAVAILABLE data either: -
      -
    1. No adapters were configured.
      2. -
    2. The adapters is down, and no data is available. To check this, telnet to ip/port of the adapter, you should see output.
      3. -
    3. The adapters data blocked by the firewall. Firewall can be on either the host or the remote adapter computer. To check this, telnet to ip/port of the adapter, you should see output. -If you see data, the firewall is most likely preventing the agent from remote access. -If you don't see data, (and you can 'ping' the remote computer, a firewall on the remote platform may be preventing an adapter from outputting SHDR to socket port 7878 (the default). -
    -
  3. If you see data, then the agent has installed and been configured correctly. Now, just monitor the agent for a couple days to insure that it is booting correctly and operating properly. -
-

UNINSTALLAION SOFTWARE INFORMATION

-There are two methods for uninstalling the Agent. Either use:
  1. The Microsoft Windows Control Panel, -or
  2. navigate to the install directory (default C:\Program Files\MTConnect\MTConnectAgent) and click uninstall.exe. -

The control panel uninstall procedure wil be described (although once the uninstall program is activated, the procedure is the same.) -

Uninstall uses the Windows mechanism: Start->Control Panale -> Programs and Features to fetch all the installed programs on the platform. -Scroll down and find the MTConnectAgentxx.xx installation. Double click uninstall, YOU WILL NEED TO HAVE ADMINISTRATOR priviledges to uninstall on windows 7 machines. -Three uninstall pages will diplay: Click Next, then Uninstall and finally Finish, and the Agent will be removed. -

Uninstalling using the control panel is preferrable, but often some quirks appear. It may be necessary to manually top the MTConnectAgent service before uninstalling. -Also, the Control Panel programs and features may not remove the MTConnectAgentxx.xx entry even though it has uninstalled the agent. A refresh may take care of this. diff --git a/install/Windows/src/x64/agent.exe b/install/Windows/src/x64/agent.exe deleted file mode 100644 index 01606d2b5..000000000 Binary files a/install/Windows/src/x64/agent.exe and /dev/null differ diff --git a/install/Windows/src/x64/msvcr100.dll b/install/Windows/src/x64/msvcr100.dll deleted file mode 100644 index fd91c89d8..000000000 Binary files a/install/Windows/src/x64/msvcr100.dll and /dev/null differ diff --git a/install/Windows/src/x64/msvcrt.dll b/install/Windows/src/x64/msvcrt.dll deleted file mode 100644 index b8b31af2d..000000000 Binary files a/install/Windows/src/x64/msvcrt.dll and /dev/null differ diff --git a/install/Windows/src/x64/vc2010redist_x64.exe b/install/Windows/src/x64/vc2010redist_x64.exe deleted file mode 100644 index 834133f8b..000000000 Binary files a/install/Windows/src/x64/vc2010redist_x64.exe and /dev/null differ