devenv: fix name of webstore zip file

ports/devenv/build.sh

 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 export EXTRA_LIBS="${NACL_CLI_MAIN_LIB} \
   -lnacl_spawn -lppapi_simple \
   -lnacl_io -lppapi -lppapi_cpp -l${NACL_CPP_LIB}"
 
 EXECUTABLES="tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
              jseval/jseval_${NACL_ARCH}${NACL_EXEEXT}"
@@ skipping 66 matching lines @@
     ${START_DIR}/key.txt
 
   # Create uploadable version (key not included).
   local APP_UPLOAD_DIR="${PUBLISH_DIR}/devenv_app_upload"
   rm -rf ${APP_UPLOAD_DIR}
   LogExecute cp -r ${APP_DIR} ${APP_UPLOAD_DIR}
   GenerateManifest ${START_DIR}/manifest.json.template ${APP_UPLOAD_DIR}
 
   # Zip the full app for upload.
   ChangeDir ${PUBLISH_DIR}
-  CreateWebStoreZip devenv_small_test.zip devenv_app_upload
+  CreateWebStoreZip devenv_app_upload.zip devenv_app_upload
 
   # Copy the files for DevEnvWidget.
   local WIDGET_DIR=${PUBLISH_DIR}/devenvwidget
   MakeDir ${WIDGET_DIR}
   LogExecute cp -r ${START_DIR}/devenvwidget/* ${WIDGET_DIR}
 
   # Install tests.
   MakeDir ${PUBLISH_DIR}/tests
   LogExecute cp -r ${BUILD_DIR}/tests/* ${PUBLISH_DIR}/tests
   cd ${PUBLISH_DIR}/tests
   if [ "${NACL_ARCH}" = "pnacl" ]; then
     LogExecute ${PNACLFINALIZE} devenv_small_test_${NACL_ARCH}${NACL_EXEEXT}
   fi
   LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \
       devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
       -s . \
       -o devenv_small_test.nmf
   LogExecute mv devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \
       devenv_small_test_${NACL_ARCH}
 
-  CreateWebStoreZip devenv_small_test.zip .
+  Remove devenv_small_test.zip
+  LogExecute zip -r devenv_small_test.zip *
 }
 
 PostInstallTestStep() {
   local arches=
   if [[ ${OS_NAME} == Darwin && ${NACL_ARCH} == x86_64 ]]; then
     echo "Skipping devenv tests on unsupported mac + x86_64 configuration."
   elif [[ ${NACL_ARCH} == arm ]]; then
     echo "Skipping devenv tests on arm for now."
   elif [[ ${NACL_ARCH} == pnacl ]]; then
     arches="i686 x86_64"
   else
     arches="${NACL_ARCH}"
   fi
   for arch in ${arches}; do
     LogExecute python ${START_DIR}/devenv_small_test.py -x -vv -a ${arch}
     if [[ ${NACL_ARCH} == pnacl ]]; then
       LogExecute python ${START_DIR}/jseval_test.py -x -vv -a ${arch}
     fi
   done
 }