Included etwpackage\ in etwpackage.zip paths

Author: randomascii

make_zip_file.py

@@ -9,10 +9,8 @@
 filename = sys.argv[1]
 dirToZip = sys.argv[2]
 
-# Change to the specified directory so that relative paths are added instead
-# of absolute paths.
-os.chdir(dirToZip)
-dirToZip = "."
+# Assume that dirToZip is a relative directory.
+dirToZip = dirToZip
 
 # Request compression
 zf = zipfile.ZipFile(filename, "w", zipfile.ZIP_DEFLATED)

package_etw.bat

@@ -64,7 +64,7 @@ xcopy %UIforETW%\bin\UIforETWStatic_devrel32.exe %destdir%\bin\UIforETW32.exe /y
 xcopy %UIforETW%\bin\UIforETWStatic_devrel.exe %destdir%\bin\UIforETW.exe /y
 xcopy %destdir%\bin\UIforETW*.exe %~dp0bin /y
 
-python %UIforETW%make_zip_file.py %UIforETW%etwpackage.zip %destdir%
+python %UIforETW%make_zip_file.py %UIforETW%etwpackage.zip etwpackage
 
 @echo Now upload the new etwpackage.zip
 @exit /b