[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] installer/common/util/platform/win stage1.cpp,1.2,1.3
From:       vijendrakumara () helixcommunity ! org
Date:       2007-11-23 11:46:39
Message-ID: 200711231146.lANBkpwC026529 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/installer/common/util/platform/win
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv2276

Modified Files:
	stage1.cpp 
Log Message:
Reviewed By : Jamie Gordon

Synopsis

=========

CR : installer Changes

Branches: SERVER_11_1_RN

Suggested Reviewer: Dean Collins, Jamie Gordon

Description

===========

The changes to the installer files has been done according to mentioned in
the specs
1.        The help string has been changed. ( -s and –p string has been
removed )
2.        Password validation for –s and –p has been added.
3.        Password acceptance as 2nd argument ( when –s or –p flag not
present )
has been added.
4.        Validation of license file has been done partly.
        If password is incorrect AND license file is empty then asking for
license file – done
     If password is incorrect AND license file path is of dir path then
asking for license file again – done
     If password is incorrect ANS license file path is of file but its not
a valid license file – Not yet done

All these changes has been done and tested for linux and Win platform and for all branches.

Files Affected
==============
server/installer/common/platform/unix/stage1.cpp
server/installer/common/util/platform/win/stage1.cpp
server/installer/common/platform/servinstlib.cpp
server/installer/common/platform/pub/servinstlib.h
server/installer/common/Umakefil
server/installer/common/Util/Umakefil
server-restricted/installer/common/package_info.cpp
server-restricted/installer/common/pub/package_name.h
server-restricted/installer/common/platform/unix/postinst.cpp
server-restricted/installer/common/platform/win/instdlg.cpp

Testing Performed

=================

Functional Tests:
-----------------

-        verified by running mobile and retail , server and proxy with all
combination of –s and –p - working fine
-        verified by running mobile and retail , server and proxy with all
combination of password - working fine
-        verified by running mobile and retail , server and proxy with
–help –
working fine
-        after removing HELIX_FEATURE_SERVER_STRICT_EULA from .pf files
mannually
and build again. Verifed it is working as normal and not having any affect
of changes.

Integration Tests:

n/a

Leak Tests:

n/a

Performance Tests:

n/a

Platforms Tested: win32-i386-vc7
linux-rhel4-i686

Build verified:
win32-i386-vc7
linux-rhel4-i686

QA Hints

========

None

Thanks and Regards
Vijendra


Index: stage1.cpp
===================================================================
RCS file: /cvsroot/server/installer/common/util/platform/win/stage1.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- stage1.cpp	23 Jan 2003 23:43:00 -0000	1.2
+++ stage1.cpp	23 Nov 2007 11:46:36 -0000	1.3
@@ -71,6 +71,9 @@
 
 //#include "package_info.h"
 #include "stage1.h"
+#if !defined(_DEBUG) && defined (HELIX_FEATURE_SERVER_STRICT_EULA)
+#include "package_name.h"
+#endif
 //#include "servinstlib.h"
 
 
@@ -151,12 +154,38 @@
             strcmp(argv[i], "-s") == 0 ||
             strcmp(argv[i], "/s") == 0)
         {
+#if !defined(_DEBUG) && defined (HELIX_FEATURE_SERVER_STRICT_EULA)
+
+            char szSilentPass[MAX_PASS]={0};
+            if(++i < argc)
+            {
+                strncpy(szSilentPass, argv[i], MAX_PASS-1);
+            }
+            if(strcmp(szSilentPass, HELIX_SERVER_INSTALLER_PASSWORD ) == 0)
+            {
+                m_ulInstFlags |= INST_SILENT | INST_NON_INTERACTIVE;
+            }
+#else        
             m_ulInstFlags |= INST_SILENT | INST_NON_INTERACTIVE;
+#endif
         }
         else if (strcmp(argv[i], "--progress-only") == 0 ||
                  strcmp(argv[i], "-p") == 0)
         {
+#if !defined(_DEBUG) && defined (HELIX_FEATURE_SERVER_STRICT_EULA)
+
+            char szProgPass[MAX_PASS]={0};
+            if(++i < argc)
+            {
+                strncpy(szProgPass, argv[i], MAX_PASS-1);
+            }
+            if(strcmp(szProgPass, HELIX_SERVER_INSTALLER_PASSWORD ) == 0)
+            {
+                m_ulInstFlags |= INST_NON_INTERACTIVE;
+            }
+#else        
             m_ulInstFlags |= INST_NON_INTERACTIVE;
+#endif
         }
         else if(strcmp(argv[i], "--password") == 0)
         {


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]