From: msweet Date: Fri, 29 Aug 2014 17:50:38 +0000 (+0000) Subject: Save work X-Git-Tag: v2.2b1~489 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b6d468c9a837ec1620369a6dbf9770fc3914ff8;p=thirdparty%2Fcups.git Save work git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12139 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/everywhere/bonjour-tests.bat b/everywhere/bonjour-tests.bat index 6f109f2dc..b4cbf41c3 100644 --- a/everywhere/bonjour-tests.bat +++ b/everywhere/bonjour-tests.bat @@ -1,4 +1,4 @@ -@echo off +::@echo off :: :: "$Id$" :: @@ -23,91 +23,96 @@ set PLIST="%1 Bonjour Results.plist" -:: Special case "_failN" name to show bad/missing TXT keys -if not "%2" == "" { +:: Special case second argument: "_keys" and "_values" to show bad/missing TXT keys +if not "%2" == "" ( echo "FAIL" echo "Errors" >>"%PLIST%" - if not defined IPPFIND_TXT_ADMINURL { + if not defined IPPFIND_TXT_ADMINURL ( echo " adminurl is not set." echo "adminurl is not set." >>"%PLIST%" - } else { - if test "%2" == "_values" { - if not %IPPFIND_TXT_ADMINURL:~0,7% == "http://" { - if not %IPPFIND_TXT_ADMINURL:~0,8% == "https://" { - echo " adminurl has bad value '%IPPFIND_TXT_ADMINURL%'." - echo "adminurl has bad value '%IPPFIND_TXT_ADMINURL%'." >>"%PLIST%" - } - } - } - } + ) else ( + if "%2" == "_values" ( + set result=FAIL + set scheme="%IPPFIND_TXT_ADMINURL:~0,7%" + if "%scheme%" == "http://" set result=PASS + set scheme="%IPPFIND_TXT_ADMINURL:~0,8%" + if "%scheme%" == "https://" set result=PASS + if "%result%" == "FAIL" ( + echo " adminurl has bad value '%IPPFIND_TXT_ADMINURL%'." + echo "adminurl has bad value '%IPPFIND_TXT_ADMINURL%'." >>"%PLIST%" + ) + ) + ) - if not defined IPPFIND_TXT_PDL { + if not defined IPPFIND_TXT_PDL ( echo " pdl is not set." echo "pdl is not set." >>"%PLIST%" - } else { - if "%2" == "_values" { - set temp=%IPPFIND_TXT_PDL:image/jpeg=% - if "%temp%" == "%IPPFIND_TXT_PDL%" { + ) else ( + if "%2" == "_values" ( + set temp="%IPPFIND_TXT_PDL:image/jpeg=%" + if "%temp%" == "%IPPFIND_TXT_PDL%" ( echo " pdl is missing image/jpeg: '%IPPFIND_TXT_PDL%'" echo "pdl is missing image/jpeg: '%IPPFIND_TXT_PDL%'." >>"%PLIST%" - } + ) - set temp=%IPPFIND_TXT_PDL:image/pwg-raster=% - if "%temp%" == "%IPPFIND_TXT_PDL%" { + set temp="%IPPFIND_TXT_PDL:image/pwg-raster=%" + if "%temp%" == "%IPPFIND_TXT_PDL%" ( echo " pdl is missing image/pwg-raster: '%IPPFIND_TXT_PDL%'" echo "pdl is missing image/pwg-raster: '%IPPFIND_TXT_PDL%'." >>"%PLIST%" - } - } - } + ) + ) + ) - if not defined IPPFIND_TXT_RP { + if not defined IPPFIND_TXT_RP ( echo " rp is not set." echo "rp is not set." >>"%PLIST%" - } else { - if "%2" == "_values" { - if not "%IPPFIND_TXT_RP%" == "ipp/print" { - if not "%IPPFIND_TXT_RP:~0,10%" == "ipp/print/" { + ) else ( + if "%2" == "_values" ( + if not "%IPPFIND_TXT_RP%" == "ipp/print" ( + if not "%IPPFIND_TXT_RP:~0,10%" == "ipp/print/" ( echo " rp has bad value '%IPPFIND_TXT_RP%'" echo "rp has bad value '%IPPFIND_TXT_RP%'." >>"%PLIST%" - } - } - } - } + ) + ) + ) + ) - if not defined IPPFIND_TXT_UUID { + if not defined IPPFIND_TXT_UUID ( echo " UUID is not set." echo "UUID is not set." >>"%PLIST%" - } else { - if "%2" == "_values" { - :: This isn't as effective as the test in bonjour-tests.sh... - if "%IPPFIND_TXT_UUID:~0,9%" == "urn:uuid:" { + ) else ( + if "%2" == "_values" ( + :: This isn't as effective as the test in bonjour-tests.sh but still + :: catches the most common error... + set scheme="%IPPFIND_TXT_UUID:~0,9%" + if "%scheme%" == "urn:uuid:" ( echo " UUID has bad value '%IPPFIND_TXT_UUID%'" echo "UUID has bad value '%IPPFIND_TXT_UUID%'." >>"%PLIST%" - } - } - } + ) + ) + ) - if "%2" == "_values" { + if "%2" == "_values" ( ipptool -t -d "ADMINURL=%IPPFIND_TXT_ADMINURL%" -d "UUID=%IPPFIND_TXT_UUID%" %IPPFIND_SERVICE_URI% bonjour-value-tests.test echo "" >>"%PLIST%" - $IPPTOOL -t -d "ADMINURL=$IPPFIND_TXT_ADMINURL" -d "UUID=$IPPFIND_TXT_UUID" $IPPFIND_SERVICE_URI bonjour-value-tests.test | findstr /r '[TD]:' >>"%PLIST%" + $IPPTOOL -t -d "ADMINURL=$IPPFIND_TXT_ADMINURL" -d "UUID=$IPPFIND_TXT_UUID" $IPPFIND_SERVICE_URI bonjour-value-tests.test | findstr /r "[TD]:" >>"%PLIST%" echo "" >>"%PLIST%" - } + ) echo "" >>"%PLIST%" echo "Successful" >>"%PLIST%" echo "" >>"%PLIST%" - exit -} + goto :eof +) :: Write the standard XML plist header... -echo '' >"%PLIST%" -echo '' >>"%PLIST%" -echo '' >>"%PLIST%" -echo '' >>"%PLIST%" -echo 'Tests' >>"%PLIST%" +echo "" >"%PLIST%" +echo "" >>"%PLIST%" +echo "" >>"%PLIST%" +echo "" >>"%PLIST%" +echo "Tests" >>"%PLIST%" set total=0 set pass=0 @@ -118,187 +123,184 @@ set skip=0 call :start_test "B-1. IPP Browse test" set result=FAIL ippfind _ipp._tcp,_print.local. --name "%1" --quiet && set result=PASS -if "%result%" == "PASS" { - set /a pass=pass+1 +if "%result%" == "PASS" ( + set /a pass+=1 call :end_test PASS -} else { - set /a fail=fail+1 +) else ( + set /a fail+=1 call :end_test FAIL -} +) :: B-2. IPP TXT keys test: The IPP TXT record contains all required keys. call :start_test "B-2. IPP TXT keys test" set result=FAIL ippfind "%1._ipp._tcp.local." --txt adminurl --txt pdl --txt rp --txt UUID --quiet && set result=PASS -if "%result%" == "PASS" { - set /a pass=pass+1 +if "%result%" == "PASS" ( + set /a pass+=1 call :end_test PASS -} else { - set /a fail=fail+1 - ippfind "$1._ipp._tcp.local." -x bonjour-tests.bat '{service_name}' _keys \; -} +) else ( + set /a fail+=1 + ippfind "%1._ipp._tcp.local." -x bonjour-tests.bat "{service_name}" _keys ";" +) :: B-3. IPP Resolve test: Printer responds to an IPP Get-Printer-Attributes request using the resolved hostname, port, and resource path. call :start_test "B-3. IPP Resolve test" set result=FAIL -ippfind "%1._ipp._tcp.local." --ls >/dev/null && set result=PASS -if "%result%" == "PASS" { - set /a pass=pass+1 +(ippfind "%1._ipp._tcp.local." --ls && set result=PASS) >nul: +if "%result%" == "PASS" ( + set /a pass+=1 call :end_test PASS -} else { - set /a fail=fail+1 +) else ( + set /a fail+=1 echo "Errors" >>"%PLIST%" - ippfind "$1._ipp._tcp.local." --ls >>"%PLIST%" + ippfind "%1._ipp._tcp.local." --ls >>"%PLIST%" echo "" >>"%PLIST%" call :end_test FAIL -} +) :: B-4. IPP TXT values test: The IPP TXT record values match the reported IPP attribute values. call :start_test "B-4. IPP TXT values test" set result=FAIL -ippfind "%1._ipp._tcp.local." --txt-adminurl '^(http:|https:)//' --txt-pdl 'image/pwg-raster' --txt-pdl 'image/jpeg' --txt-rp '^ipp/(print|print/[^/]+)$' --txt-UUID '^[0-9a-fA-F]{8,8}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{12,12}$' -x $IPPTOOL -q -d 'ADMINURL={txt_adminurl}' -d 'UUID={txt_uuid}' '{}' bonjour-value-tests.test \; && set result=PASS -if "%result%" == "PASS" { - set /a pass=pass+1 +ippfind "%1._ipp._tcp.local." --txt-adminurl "^(http:|https:)//" --txt-pdl image/pwg-raster --txt-pdl image/jpeg --txt-rp "^ipp/(print|print/[^/]+)$" --txt-UUID "^[0-9a-fA-F]{8,8}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{12,12}$" -x $IPPTOOL -q -d "ADMINURL={txt_adminurl}" -d "UUID={txt_uuid}" "{}" bonjour-value-tests.test ";" && set result=PASS +if "%result%" == "PASS" ( + set /a pass+=1 call :end_test PASS -} else { - set /a fail=fail+1 - ippfind "%1._ipp._tcp.local." -x bonjour-tests.bat '{service_name}' _values \; -fi +) else ( + set /a fail+=1 + ippfind "%1._ipp._tcp.local." -x bonjour-tests.bat "{service_name}" _values ";" +) :: B-5. TLS tests: Performed only if TLS is supported call :start_test "B-5. TLS tests" set result=FAIL -find "$1._ipp._tcp.local." --txt tls --quiet && set result=PASS -if "%result%" == "PASS" { - set /a pass=pass+1 +find "%1._ipp._tcp.local." --txt tls --quiet && set result=PASS +if "%result%" == "PASS" ( + set /a pass+=1 set HAVE_TLS=1 call :end_test PASS -} else { - set /a skip=skip+1 +) else ( + set /a skip+=1 set HAVE_TLS=0 call :end_test SKIP -} +) :: B-5.1 HTTP Upgrade test: Printer responds to an IPP Get-Printer-Attributes request after doing an HTTP Upgrade to TLS. call :start_test "B-5.1 HTTP Upgrade test" -if %HAVE_TLS% == 1 { +if "%HAVE_TLS%" == "1" ( set result=FAIL - ippfind "%1._ipp._tcp.local." -x ipptool -E -q '{}' bonjour-access-tests.test \; && set result=PASS - if "%result%" == "PASS" { - set /a pass=pass+1 + ippfind "%1._ipp._tcp.local." -x ipptool -E -q "{}" bonjour-access-tests.test ";" && set result=PASS + if "%result%" == "PASS" ( + set /a pass+=1 call :end_test PASS - } else { - set /a fail=fail+1 + ) else ( + set /a fail+=1 echo "Errors" >>"%PLIST" - ippfind "%1._ipp._tcp.local." -x ipptool -E -q '{}' bonjour-access-tests.test \; >>"%PLIST%" + ippfind "%1._ipp._tcp.local." -x ipptool -E -q "{}" bonjour-access-tests.test ";" >>"%PLIST%" echo "" >>"%PLIST%" call :end_test FAIL - } -} else { - set /a skip=skip+1 + ) +) else ( + set /a skip+=1 call :end_test SKIP -} +) :: B-5.2 IPPS Browse test: Printer appears in a search for "_ipps._tcp,_print" services. -start_test "B-5.2 IPPS Browse test" -if test $HAVE_TLS = 1; then - $IPPFIND _ipps._tcp,_print.local. --name "$1" --quiet - if test $? = 0; then - pass=`expr $pass + 1` - end_test PASS - else - fail=`expr $fail + 1` - end_test FAIL - fi -else - skip=`expr $skip + 1` - end_test SKIP -fi +call :start_test "B-5.2 IPPS Browse test" +if "%HAVE_TLS%" == "1" ( + set result=FAIL + ippfind _ipps._tcp,_print.local. --name "%1" --quiet && set result=PASS + if "%result%" == "PASS" ( + set /a pass+=1 + call :end_test PASS + ) else ( + set /a fail+=1 + call :end_test FAIL + ) +) else ( + set /a skip+=1 + call :end_test SKIP +) :: B-5.3 IPPS TXT keys test: The TXT record for IPPS contains all required keys -start_test "B-5.3 IPPS TXT keys test" -if test $HAVE_TLS = 1; then - $IPPFIND "$1._ipps._tcp.local." --txt adminurl --txt pdl --txt rp --txt TLS --txt UUID --quiet - if test $? = 0; then - pass=`expr $pass + 1` - end_test PASS - else - fail=`expr $fail + 1` - $IPPFIND "$1._ipps._tcp.local." -x ./bonjour-tests.sh '{service_name}' _fail5.3 \; - fi -else - skip=`expr $skip + 1` - end_test SKIP -fi +call :start_test "B-5.3 IPPS TXT keys test" +if "%HAVE_TLS%" == "1" ( + set result=FAIL + ippfind "%1._ipps._tcp.local." --txt adminurl --txt pdl --txt rp --txt TLS --txt UUID --quiet && set result=PASS + if "%result%" == "PASS" ( + set /a pass+=1 + call :end_test PASS + ) else ( + set /a fail+=1 + ippfind "%1._ipps._tcp.local." -x bonjour-tests.bat "{service_name}" _keys ";" + ) +) else ( + set /a skip+=1 + call :end_test SKIP +) :: B-5.4 IPPS Resolve test: Printer responds to an IPPS Get-Printer-Attributes request using the resolved hostname, port, and resource path. -start_test "B-5.4 IPPS Resolve test" -if test $HAVE_TLS = 1; then - $IPPFIND "$1._ipps._tcp.local." --ls >/dev/null - if test $? = 0; then - pass=`expr $pass + 1` - end_test PASS - else - fail=`expr $fail + 1` - echo "Errors" >>"%PLIST%" - $IPPFIND "$1._ipps._tcp.local." --ls | awk '{ print "" $0 "" }' >>"%PLIST%" - echo "" >>"%PLIST%" - end_test FAIL - fi -else - skip=`expr $skip + 1` - end_test SKIP -fi +call :start_test "B-5.4 IPPS Resolve test" +if "%HAVE_TLS%" == "1" ( + set result=FAIL + (ippfind "%1._ipps._tcp.local." --ls && set result=PASS) >nul: + if "%result%" == "PASS" ( + set /a pass+=1 + call :end_test PASS + ) else ( + set /a fail+=1 + echo "Errors" >>"%PLIST%" + ippfind "%1._ipps._tcp.local." --ls >>"%PLIST%" + echo "" >>"%PLIST%" + call :end_test FAIL + ) +) else ( + set /a skip+=1 + call :end_test SKIP +) :: B-5.5 IPPS TXT values test: The TXT record values for IPPS match the reported IPPS attribute values. -start_test "B-5.5 IPPS TXT values test" -if test $HAVE_TLS = 1; then - $IPPFIND "$1._ipps._tcp.local." --txt-adminurl '^(http:|https:)//' --txt-pdl 'image/pwg-raster' --txt-pdl 'image/jpeg' --txt-rp '^ipp/(print|print/[^/]+)$' --txt-UUID '^[0-9a-fA-F]{8,8}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{12,12}$' -x $IPPTOOL -q -d 'ADMINURL={txt_adminurl}' -d 'UUID={txt_uuid}' '{}' bonjour-value-tests.test \; - if test $? = 0; then - pass=`expr $pass + 1` - end_test PASS - else - fail=`expr $fail + 1` - $IPPFIND "$1._ipps._tcp.local." -x ./bonjour-tests.sh '{service_name}' _fail5.5 \; - fi -else - skip=`expr $skip + 1` - end_test SKIP -fi +call :start_test "B-5.5 IPPS TXT values test" +if "%HAVE_TLS%" == "1" ( + set result=FAIL + ippfind "%1._ipps._tcp.local." --txt-adminurl "^(http:|https:)//" --txt-pdl image/pwg-raster --txt-pdl image/jpeg --txt-rp "^ipp/(print|print/[^/]+)$" --txt-UUID "^[0-9a-fA-F]{8,8}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{12,12}$" -x ipptool -q -d "ADMINURL={txt_adminurl}" -d "UUID={txt_uuid}" "{}" bonjour-value-tests.test ";" && set result=PASS + if "%result%" == "PASS" ( + set /a pass+=1 + call :end_test PASS + ) else ( + set /a fail+=1 + ippfind "%1._ipps._tcp.local." -x bonjour-tests.bat "{service_name}" _values ";" + ) +) else ( + set /a skip+=1 + call :end_test SKIP +) :: Finish up... -if test $fail -gt 0; then - cat >>"%PLIST%" < -Successful - -EOF -else - cat >>"%PLIST%" < -Successful - -EOF -fi - -cat >>"%PLIST%" < - -EOF +echo "" >>"%PLIST%" +echo "Successful" >>"%PLIST%" +if %fail% gtr 0 ( + echo "" >>"%PLIST%" +) else ( + echo "" >>"%PLIST%" +) +echo "" >>"%PLIST%" +echo "" >>"%PLIST%" -score=`expr $pass + $skip` -score=`expr 100 \* $score / $total` -echo "Summary: $total tests, $pass passed, $fail failed, $skip skipped" -echo "Score: ${score}%" +set /a score=%pass% + %skip% +set /a score=100 * %score% / %total% +echo "Summary: %total% tests, %pass% passed, %fail% failed, %skip% skipped" +echo "Score: %score%^%" exit :: call :start_test "name" :start_test + set /a total+=1 setlocal - set /a total=total+1 - set Name$1" >>"%PLIST%" + set name=%1 + set name=%name:~1,-1% + set Name%name%" >>"%PLIST%" echo "FileIdorg.pwg.ipp-everywhere.20140826.bonjour" >>"%PLIST%" endlocal goto :eof @@ -307,16 +309,16 @@ exit :end_test setlocal echo %1 - if "%1" == "FAIL" { + if "%1" == "FAIL" ( echo "Successful" >>"%PLIST%" - } else { - if "%1" == "SKIP" { + ) else ( + if "%1" == "SKIP" ( echo "Successful" >>"%PLIST%" echo "Skipped" >>"%PLIST%" - } else { + ) else ( echo "Successful" >>"%PLIST%" - } - } + ) + ) echo "" >>"%PLIST%" endlocal goto :eof diff --git a/everywhere/document-tests.bat b/everywhere/document-tests.bat index 601b836ff..3d287844c 100644 --- a/everywhere/document-tests.bat +++ b/everywhere/document-tests.bat @@ -21,7 +21,7 @@ :: document-tests.bat 'Printer Name' :: -ippfind "%1._ipp._tcp.local." -x ipptool -P "\"%1 Document Results.plist\"" -I "{}" document-tests.test "\";\"" +ippfind "%1._ipp._tcp.local." -x ipptool -P "\"%1 Document Results.plist\"" -I "{}" document-tests.test ";" :: :: End of "$Id$". diff --git a/everywhere/ipp-tests.bat b/everywhere/ipp-tests.bat index 61f56ca19..f65f528cc 100644 --- a/everywhere/ipp-tests.bat +++ b/everywhere/ipp-tests.bat @@ -21,7 +21,7 @@ :: ipp-tests.bat 'Printer Name' :: -ippfind "%1._ipp._tcp.local." -x ipptool -P "\"%1 IPP Results.plist\"" -I "{}" ipp-tests.test "\";\"" +ippfind "%1._ipp._tcp.local." -x ipptool -P "\"%1 IPP Results.plist\"" -I "{}" ipp-tests.test ";" :: :: End of "$Id$". diff --git a/test/ippfind.c b/test/ippfind.c index fd1606b14..8e5c95696 100644 --- a/test/ippfind.c +++ b/test/ippfind.c @@ -307,6 +307,10 @@ main(int argc, /* I - Number of command-line args */ * Parse command-line... */ + if (getenv("IPPFIND_DEBUG")) + for (i = 1; i < argc; i ++) + fprintf(stderr, "argv[%d]=\"%s\"\n", i, argv[i]); + for (i = 1; i < argc; i ++) { if (argv[i][0] == '-') @@ -2006,6 +2010,17 @@ exec_program(ippfind_srv_t *service, /* I - Service */ } #ifdef WIN32 + if (getenv("IPPFIND_DEBUG")) + { + printf("\nProgram:\n %s\n", args[0]); + puts("\nArguments:"); + for (i = 0; i < num_args; i ++) + printf(" %s\n", myargv[i]); + puts("\nEnvironment:"); + for (i = 0; i < myenvc; i ++) + printf(" %s\n", myenvp[i]); + } + status = _spawnvpe(_P_WAIT, args[0], myargv, myenvp); #else @@ -2075,10 +2090,14 @@ exec_program(ippfind_srv_t *service, /* I - Service */ if (getenv("IPPFIND_DEBUG")) { +#ifdef WIN32 + printf("Exit Status: %d\n", status); +#else if (WIFEXITED(status)) printf("Exit Status: %d\n", WEXITSTATUS(status)); else printf("Terminating Signal: %d\n", WTERMSIG(status)); +#endif /* WIN32 */ } return (status == 0); diff --git a/test/ipptool.c b/test/ipptool.c index 4c911d5eb..db9eaf02b 100644 --- a/test/ipptool.c +++ b/test/ipptool.c @@ -647,6 +647,7 @@ main(int argc, /* I - Number of command-line args */ if (!vars.uri) { _cupsLangPuts(stderr, _("ipptool: URI required before test file.")); + _cupsLangPuts(stderr, argv[i]); usage(); } @@ -4802,6 +4803,10 @@ usage(void) _cupsLangPuts(stderr, _("Usage: ipptool [options] URI filename [ ... " "filenameN ]")); _cupsLangPuts(stderr, _("Options:")); + _cupsLangPuts(stderr, _(" --help Show help.")); + _cupsLangPuts(stderr, _(" --stop-after-include-error\n" + " Stop tests after a failed INCLUDE.")); + _cupsLangPuts(stderr, _(" --version Show version.")); _cupsLangPuts(stderr, _(" -4 Connect using IPv4.")); _cupsLangPuts(stderr, _(" -6 Connect using IPv6.")); _cupsLangPuts(stderr, _(" -C Send requests using " @@ -4811,6 +4816,7 @@ usage(void) _cupsLangPuts(stderr, _(" -I Ignore errors.")); _cupsLangPuts(stderr, _(" -L Send requests using " "content-length.")); + _cupsLangPuts(stderr, _(" -P filename.plist Produce XML plist to a file and test report to standard output.")); _cupsLangPuts(stderr, _(" -S Test with SSL " "encryption.")); _cupsLangPuts(stderr, _(" -T seconds Set the receive/send " @@ -4819,12 +4825,14 @@ usage(void) "version.")); _cupsLangPuts(stderr, _(" -X Produce XML plist instead " "of plain text.")); + _cupsLangPuts(stderr, _(" -c Produce CSV output.")); _cupsLangPuts(stderr, _(" -d name=value Set named variable to " "value.")); _cupsLangPuts(stderr, _(" -f filename Set default request " "filename.")); _cupsLangPuts(stderr, _(" -i seconds Repeat the last file with " "the given time interval.")); + _cupsLangPuts(stderr, _(" -l Produce plain text output.")); _cupsLangPuts(stderr, _(" -n count Repeat the last file the " "given number of times.")); _cupsLangPuts(stderr, _(" -q Run silently.")); diff --git a/vcnet/sw-ippeveselfcert10.vdproj b/vcnet/sw-ippeveselfcert10.vdproj index e90ea7f73..2895a46da 100644 --- a/vcnet/sw-ippeveselfcert10.vdproj +++ b/vcnet/sw-ippeveselfcert10.vdproj @@ -106,13 +106,19 @@ "Entry" { "MsmKey" = "8:_A1CB27EFF4094C39B58D0BE5A272DF1A" + "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A1CB27EFF4094C39B58D0BE5A272DF1A" "OwnerKey" = "8:_58DC0E72F0944BEFB927AED718CD1660" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_A1CB27EFF4094C39B58D0BE5A272DF1A" - "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" + "OwnerKey" = "8:_466C1CF41795452A8B76425F8D05D8B8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -207,7 +213,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:ipptool-windows.msi" + "OutputFilename" = "8:sw-ippeveselfcert10-windows.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -733,7 +739,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_E379D4EDBAD0460BB876711E9062ADB4" { - "Name" = "8:ipptool" + "Name" = "8:IPP Everywhere Printer Self-Certification Tools" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -757,7 +763,7 @@ } "{3C67513D-01DD-4637-8A68-80971EB9504F}:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" { - "DefaultLocation" = "8:[ProgramFilesFolder]\\ipptool" + "DefaultLocation" = "8:[ProgramFilesFolder]\\sw-ippeveselfcert10" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -806,7 +812,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:IPP Everywhere Printer Self-Certification Tools" "ProductCode" = "8:{C08E3AC5-4FBF-40DD-BD19-9BE69A609DAF}" - "PackageCode" = "8:{B4B703D8-1B4E-44B5-AA85-F722F272BEA9}" + "PackageCode" = "8:{25FF31C9-52A0-4838-8F1D-02FB5D5296F4}" "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" @@ -933,6 +939,20 @@ } "Shortcut" { + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_57BCED85BA5944009F56A11D5A9FBBEE" + { + "Name" = "8:ippfind Documentation" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_592FC984DBFD494D9FB7DFFEA35AD7A5" + "Folder" = "8:_E379D4EDBAD0460BB876711E9062ADB4" + "WorkingFolder" = "8:_26743E387598422398CF503F7478F9E1" + "Icon" = "8:" + "Feature" = "8:" + } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_63715171338D40FFBC5B47A1418B4814" { "Name" = "8:README" @@ -941,7 +961,7 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:" + "Target" = "8:_27AB74FFFBC7436B9EBC6AE23968CFCC" "Folder" = "8:_E379D4EDBAD0460BB876711E9062ADB4" "WorkingFolder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" "Icon" = "8:" @@ -961,6 +981,20 @@ "Icon" = "8:" "Feature" = "8:" } + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_962004B0D5CA479A91EFA7F7BF7814C8" + { + "Name" = "8:ippserver Documentation" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_1BCBABF5693841AE92515645BB7765F4" + "Folder" = "8:_E379D4EDBAD0460BB876711E9062ADB4" + "WorkingFolder" = "8:_26743E387598422398CF503F7478F9E1" + "Icon" = "8:" + "Feature" = "8:" + } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_BD2A7DF74D844FF5919EE8340EE36ECD" { "Name" = "8:Test File Documentation"