diff --git a/Images/ApplicationFolder/wpkginst.exe b/Images/ApplicationFolder/wpkginst.exe index 50091e6..7ca78f9 100644 Binary files a/Images/ApplicationFolder/wpkginst.exe and b/Images/ApplicationFolder/wpkginst.exe differ diff --git a/Images/Setup/WPKGSetup.msi b/Images/Setup/WPKGSetup.msi index 461d7af..4ab9b45 100644 Binary files a/Images/Setup/WPKGSetup.msi and b/Images/Setup/WPKGSetup.msi differ diff --git a/Images/Setup/setup.bat b/Images/Setup/setup.bat index f2551c5..8af033f 100644 --- a/Images/Setup/setup.bat +++ b/Images/Setup/setup.bat @@ -1,4 +1 @@ -setup /i PATH=PATH FILE=FILE PATHUSER=PATHUSER PATHPASSWORD=PATHPASSWORD EXECUSER=EXECUSER EXECPASSWORD=EXECPASSWORD PARAMETERS=PARAMETERS SILENT=NO -SCRIPTVARNAME1=TOMEK SCRIPTVARVALUE1=EXAMPLEVARIALBE - - +setup /i /quiet SCRIPTVARNAME1="TOMEK ROMEK i ATOMEK" PATH=PATH FILE=FILE PATHUSER=PATHUSER PATHPASSWORD=PATHPASSWORD EXECUSER=EXECUSER EXECPASSWORD=EXECPASSWORD PARAMETERS="TWO PARAMETERS" SILENT="YES" SCRIPTVARVALUE1="EXAMPLE VARIALBE TEST NUMBER ONE" diff --git a/Sources/Components/vssver.scc b/Sources/Components/vssver.scc index f7a05cf..9e586d6 100644 Binary files a/Sources/Components/vssver.scc and b/Sources/Components/vssver.scc differ diff --git a/Sources/MainService/WPKGSrv.ncb b/Sources/MainService/WPKGSrv.ncb new file mode 100644 index 0000000..75a187e Binary files /dev/null and b/Sources/MainService/WPKGSrv.ncb differ diff --git a/Sources/MainService/WPKGSrv.suo b/Sources/MainService/WPKGSrv.suo index 2a4bffc..b39ec86 100644 Binary files a/Sources/MainService/WPKGSrv.suo and b/Sources/MainService/WPKGSrv.suo differ diff --git a/Sources/MainService/mssccprj.scc b/Sources/MainService/mssccprj.scc index bcece58..0d263ef 100644 --- a/Sources/MainService/mssccprj.scc +++ b/Sources/MainService/mssccprj.scc @@ -2,8 +2,8 @@ SCC = This is a Source Code Control file [WPKGSrv.sln] SCC_Aux_Path = "F:\VSSProjects" -SCC_Project_Name = "$/WPKG/MainService", AJAAAAAA +SCC_Project_Name = "$/WPKG/MainService", DLAAAAAA [WPKGSrv.vcproj] SCC_Aux_Path = "F:\VSSProjects" -SCC_Project_Name = "$/WPKG/MainService", AJAAAAAA +SCC_Project_Name = "$/WPKG/MainService", DLAAAAAA diff --git a/Sources/MainService/vssver.scc b/Sources/MainService/vssver.scc index 84c04c7..9eb768d 100644 Binary files a/Sources/MainService/vssver.scc and b/Sources/MainService/vssver.scc differ diff --git a/Sources/WPKGSetup/WPKGSetup.suo b/Sources/WPKGSetup/WPKGSetup.suo index c7509f0..712184b 100644 Binary files a/Sources/WPKGSetup/WPKGSetup.suo and b/Sources/WPKGSetup/WPKGSetup.suo differ diff --git a/Sources/WPKGSetup/mssccprj.scc b/Sources/WPKGSetup/mssccprj.scc index 6e62301..e36463d 100644 --- a/Sources/WPKGSetup/mssccprj.scc +++ b/Sources/WPKGSetup/mssccprj.scc @@ -2,8 +2,8 @@ SCC = This is a Source Code Control file [WPKGSetup.sln] SCC_Aux_Path = "F:\VSSProjects" -SCC_Project_Name = "$/WPKG/WPKGSetup", IKAAAAAA +SCC_Project_Name = "$/WPKG/WPKGSetup", INAAAAAA [WPKGSetup.vdproj] SCC_Aux_Path = "F:\VSSProjects" -SCC_Project_Name = "$/WPKG/WPKGSetup", IKAAAAAA +SCC_Project_Name = "$/WPKG/WPKGSetup", INAAAAAA diff --git a/Sources/WPKGSetup/vssver.scc b/Sources/WPKGSetup/vssver.scc index 7b4a236..84b3c0d 100644 Binary files a/Sources/WPKGSetup/vssver.scc and b/Sources/WPKGSetup/vssver.scc differ diff --git a/Sources/wpkginst/mssccprj.scc b/Sources/wpkginst/mssccprj.scc index 1be63da..e10023e 100644 --- a/Sources/wpkginst/mssccprj.scc +++ b/Sources/wpkginst/mssccprj.scc @@ -2,8 +2,8 @@ SCC = This is a Source Code Control file [wpkginst.sln] SCC_Aux_Path = "F:\VSSProjects" -SCC_Project_Name = "$/WPKG/wpkginst", RJAAAAAA +SCC_Project_Name = "$/WPKG/wpkginst", TLAAAAAA [wpkginst.vcproj] SCC_Aux_Path = "F:\VSSProjects" -SCC_Project_Name = "$/WPKG/wpkginst", RJAAAAAA +SCC_Project_Name = "$/WPKG/wpkginst", TLAAAAAA diff --git a/Sources/wpkginst/res/vssver.scc b/Sources/wpkginst/res/vssver.scc index 15847a5..79c9d1a 100644 Binary files a/Sources/wpkginst/res/vssver.scc and b/Sources/wpkginst/res/vssver.scc differ diff --git a/Sources/wpkginst/vssver.scc b/Sources/wpkginst/vssver.scc index f6d0976..ae91cc9 100644 Binary files a/Sources/wpkginst/vssver.scc and b/Sources/wpkginst/vssver.scc differ diff --git a/Sources/wpkginst/wpkginst.cpp b/Sources/wpkginst/wpkginst.cpp index 7d6bf17..1084f6b 100644 --- a/Sources/wpkginst/wpkginst.cpp +++ b/Sources/wpkginst/wpkginst.cpp @@ -67,6 +67,7 @@ BOOL CWpkgInstApp::InitInstance() //TODO: kasowanie = usuń //s.DeleteSecret(); + //AfxMessageBox(m_lpCmdLine); ///////////////////////// BOOL bSilent = FALSE; @@ -84,29 +85,26 @@ BOOL CWpkgInstApp::InitInstance() } - if(!bSilent) + if(s.LoadSecret()) { - if(s.LoadSecret()) - { - s.m_strScriptPath = param.GetParameter("path"); - s.m_strScriptFile = param.GetParameter("file"); - if(s.m_strScriptFile.IsEmpty()) - s.m_strScriptFile = "wpkg.js"; - s.m_strScriptParameters = param.GetParameter("parameters"); - if(s.m_strScriptParameters.IsEmpty()) - s.m_strScriptParameters = " /synchronize /nonotify /quiet"; - s.m_strScriptConnUser = param.GetParameter("PathUser"); - s.m_strScriptConnPassword = param.GetParameter("PathPassword"); - s.m_strScriptExecUser = param.GetParameter("ExecUser"); - if(s.m_strScriptExecUser.IsEmpty()) - s.m_strScriptExecUser = "SYSTEM"; - s.m_strScriptExecPassword = param.GetParameter("execpassword"); - s.m_strScriptVarName1 = param.GetParameter("ScriptVarName1"); - s.m_strScriptVarValue1 = param.GetParameter("ScriptVarValue1"); - - } + s.m_strScriptPath = param.GetParameter("path"); + s.m_strScriptFile = param.GetParameter("file"); + if(s.m_strScriptFile.IsEmpty()) + s.m_strScriptFile = "wpkg.js"; + s.m_strScriptParameters = param.GetParameter("parameters"); + if(s.m_strScriptParameters.IsEmpty()) + s.m_strScriptParameters = " /synchronize /nonotify /quiet"; + s.m_strScriptConnUser = param.GetParameter("PathUser"); + s.m_strScriptConnPassword = param.GetParameter("PathPassword"); + s.m_strScriptExecUser = param.GetParameter("ExecUser"); + if(s.m_strScriptExecUser.IsEmpty()) + s.m_strScriptExecUser = "SYSTEM"; + s.m_strScriptExecPassword = param.GetParameter("execpassword"); + s.m_strScriptVarName1 = param.GetParameter("ScriptVarName1"); + s.m_strScriptVarValue1 = param.GetParameter("ScriptVarValue1"); + } - + CWpkgInstDlg dlg; dlg.m_strScriptPath = s.m_strScriptPath; diff --git a/Sources/wpkginst/wpkginst.ncb b/Sources/wpkginst/wpkginst.ncb new file mode 100644 index 0000000..1396c5a Binary files /dev/null and b/Sources/wpkginst/wpkginst.ncb differ diff --git a/Sources/wpkginst/wpkginst.suo b/Sources/wpkginst/wpkginst.suo index ea05763..0ea2b0b 100644 Binary files a/Sources/wpkginst/wpkginst.suo and b/Sources/wpkginst/wpkginst.suo differ diff --git a/Sources/wpkginst/wpkginstDlg.cpp b/Sources/wpkginst/wpkginstDlg.cpp index 2e576ce..e1980fc 100644 --- a/Sources/wpkginst/wpkginstDlg.cpp +++ b/Sources/wpkginst/wpkginstDlg.cpp @@ -11,6 +11,7 @@ #define new DEBUG_NEW #endif +#pragma warning(disable : 4996) // CWpkgInstDlg dialog