(file) Return to commands.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/commands.mak between version 1.24 and 1.26

version 1.24, 2005/03/26 09:03:18 version 1.26, 2005/04/08 19:12:53
Line 60 
Line 60 
     DOCXX = doc++     DOCXX = doc++
  
     GENERATE_RANDSEED = randseed     GENERATE_RANDSEED = randseed
     GET_HOSTNAME = `hostname`      GET_HOSTNAME = `nslookup \`hostname\` | grep "Name:" | sed 's/Name:[ ]*//'`
  
     ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)     ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)
         LIB_LINK_SUFFIX = .sl         LIB_LINK_SUFFIX = .sl
Line 133 
Line 133 
     CAT = cat     CAT = cat
     DOCXX = doc++     DOCXX = doc++
  
     GET_HOSTNAME = `hostname`      GET_HOSTNAME = `host \`hostname\`|cut -d" " -f1`
  
     LIB_LINK_SUFFIX = .so     LIB_LINK_SUFFIX = .so
  
Line 184 
Line 184 
 endif endif
  
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
     STRIPCRS =      STRIPCRS =$(MUEXE) echo "STRIPCRS not defined in commands.mak"
     DIFF = mu compare     DIFF = mu compare
     SORT = mu sort     SORT = mu sort
     REDIRECTERROR =      REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = wait     SLEEP = wait
Line 195 
Line 195 
     MUEXE = mu     MUEXE = mu
     MKDIRHIER = $(MUEXE) mkdirhier     MKDIRHIER = $(MUEXE) mkdirhier
     RMDIRHIER = $(MUEXE) rmdirhier     RMDIRHIER = $(MUEXE) rmdirhier
     ECHO =      ECHO = $(MUEXE) echo
     ECHO-E =      ECHO-E = $(MUEXE) echo "ECHO-E not defined in commands.mak"
     CHMOD =      CHMOD = $(MUEXE) echo "CHMOD not defined in commands.mak"
     CHOWN =      CHOWN = $(MUEXE) echo "CHOWN not defined in commands.mak"
     CHGRP =      CHGRP = $(MUEXE) echo  "CHGRP not defined in commands.mak"
 endif endif
  
 ifeq ($(OS),aix) ifeq ($(OS),aix)
Line 320 
Line 320 
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
   
   ifndef PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN
     PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN=$(GET_HOSTNAME)
   endif
   
   createSSLCnfFile: CMDSFORCE
           @$(RM) $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "[ req ]" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "distinguished_name     = req_distinguished_name" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "prompt                 = no"  >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "[ req_distinguished_name ]" >>  $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "C                      = $(PEGASUS_SSLCNF_COUNTRY_CODE)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "ST                     = $(PEGASUS_SSLCNF_STATE)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "L                      = $(PEGASUS_SSLCNF_LOCALITY)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "O                      = $(PEGASUS_SSLCNF_ORGANIZATION)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "OU                     = $(PEGASUS_SSLCNF_ORGANIZATION_UNIT)" >> $(PEGASUS_SSLCERT_CNFFILE)
           @$(ECHO) "CN                     = $(PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN)" >> $(PEGASUS_SSLCERT_CNFFILE)
   
   createSSLCertificate: CMDSFORCE
   ifdef PEGASUS_SSL_RANDOMFILE
           @$(OPENSSL_COMMAND) req -x509 -days $(PEGASUS_SSLCERT_DAYS) -newkey rsa:2048 -rand $(PEGASUS_SSLCERT_RANDOMFILE) -nodes -config $(PEGASUS_SSLCERT_CNFFILE) -keyout $(PEGASUS_SSLCERT_KEYFILE) -out
   $(PEGASUS_SSLCERT_CERTFILE)
   else
           @$(OPENSSL_COMMAND) req -x509 -days $(PEGASUS_SSLCERT_DAYS) -newkey rsa:2048 -nodes -config $(PEGASUS_SSLCERT_CNFFILE) -keyout $(PEGASUS_SSLCERT_KEYFILE) -out $(PEGASUS_SSLCERT_CERTFILE)
   endif
   
   displayCertificate: CMDSFORCE
           @$(OPENSSL_COMMAND) x509 -in $(PEGASUS_SSLCERT_CERTFILE) -text


Legend:
Removed from v.1.24  
changed lines
  Added in v.1.26

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2