win32: moved all the code signing data into support/private

diff --git a/.gitignore b/.gitignore
index 2a282e97d818bfb640ea65bf235125be4742cfc8..fbf4edc91fe3b9c3d92965ea5db93df262ce47c0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,10 @@
 *.suo
 *.user
 
-/support/sign-binary.cmd
-/support/create-cat.cmd
+/support/private
 
 /driver/p8usb-cec.cat
+/bootloader-driver/p8_usb_dfu.cat
 
 aclocal.m4
 autom4te.cache

diff --git a/COPYING b/COPYING
index d07d89b3f912ec23da397fb040c4399de2fb951e..c19af3b5065b44fe8f18d30f929b1e1f9beb25e4 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,34 +1,33 @@
-/*
- * This file is part of the libCEC(R) library.
- *
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
- * libCEC(R) is a original work, containing original code.
- *
- * libCEC(R) is a trademark of Pulse-Eight Limited.
- *
- * This program is dual-licensed; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- *
- * Alternatively, you can license this library under a commercial license,
- * please contact Pulse-Eight Licensing for more information.
- *
- * For more information contact:
- * Pulse-Eight Licensing       <license@pulse-eight.com>
- *     http://www.pulse-eight.com/
- *     http://www.pulse-eight.net/
- */
+This file is part of the libCEC(R) library.
+
+libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
+libCEC(R) is a original work, containing original code.
+
+libCEC(R) is a trademark of Pulse-Eight Limited.
+
+This program is dual-licensed; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+Alternatively, you can license this library under a commercial license,
+please contact Pulse-Eight Licensing for more information.
+
+For more information contact:
+Pulse-Eight Licensing       <license@pulse-eight.com>
+    http://www.pulse-eight.com/
+    http://www.pulse-eight.net/
+
+
  
                      GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991

diff --git a/support/create-driver-installer.cmd b/support/create-driver-installer.cmd
index b07bc894e60d33bf380d4b8613d517053d2e6dd9..86d17cf8fae16864a44983a8bcca462dfd621244 100644 (file)
--- a/support/create-driver-installer.cmd
+++ b/support/create-driver-installer.cmd
@@ -11,9 +11,6 @@ rem Check for the Windows DDK
 IF NOT EXIST "C:\WinDDK\7600.16385.1" GOTO NODDK
 set DDK="C:\WinDDK\7600.16385.1"
 
-cd ..\project
-
-del /s /f /q ..\build
 mkdir ..\build
 
 echo. Copying driver installer
@@ -21,9 +18,10 @@ copy "%DDK%\redist\DIFx\dpinst\MultiLin\amd64\dpinst.exe" ..\build\dpinst-amd64.
 copy "%DDK%\redist\DIFx\dpinst\MultiLin\x86\dpinst.exe" ..\build\dpinst-x86.exe
 
 :CREATECAT
-IF EXIST "..\support\create-cat.cmd" (
+cd ..\driver
+IF EXIST "..\support\private\create-cat.cmd" (
   echo. Updating the catalogue
-  CALL ..\support\create-cat.cmd
+  CALL ..\support\private\create-cat.cmd p8usb-cec.cat
 )
 
 :CREATEINSTALLER
@@ -33,9 +31,9 @@ echo. Creating the installer
 IF NOT EXIST "..\build\p8-usbcec-driver-installer.exe" GOTO :ERRORCREATINGINSTALLER
 
 rem Sign the installer if sign-binary.cmd exists
-IF EXIST "..\support\sign-binary.cmd" (
+IF EXIST "..\support\private\sign-binary.cmd" (
   echo. Signing the installer binaries
-  CALL ..\support\sign-binary.cmd ..\build\p8-usbcec-driver-installer.exe
+  CALL ..\support\private\sign-binary.cmd ..\build\p8-usbcec-driver-installer.exe
 )
 
 echo. The installer can be found here: ..\build\p8-usbcec-driver-installer.exe

diff --git a/support/create-installer.cmd b/support/create-installer.cmd
index d3f04ff4c6f25ed1ef1419d5aa2b60a0f0e5e99a..8c37a8f93a8317d4559782fb3bd64441c578c12c 100644 (file)
--- a/support/create-installer.cmd
+++ b/support/create-installer.cmd
@@ -102,18 +102,18 @@ del /q /f ..\build\libcec.x64.lib
 
 rem Check for sign-binary.cmd, only present on the Pulse-Eight production build system
 rem Calls signtool.exe and signs the DLLs with Pulse-Eight's code signing key
-IF NOT EXIST "..\support\sign-binary.cmd" GOTO CREATEINSTALLER
+IF NOT EXIST "..\support\private\sign-binary.cmd" GOTO CREATEINSTALLER
 echo. Signing all binaries
-CALL ..\support\sign-binary.cmd ..\build\cec-client.exe
-CALL ..\support\sign-binary.cmd ..\build\CecSharpTester.exe
-CALL ..\support\sign-binary.cmd ..\build\libcec.dll
-CALL ..\support\sign-binary.cmd ..\build\LibCecSharp.dll
-CALL ..\support\sign-binary.cmd ..\build\cec-config-gui.exe
-CALL ..\support\sign-binary.cmd ..\build\x64\cec-client.x64.exe
-CALL ..\support\sign-binary.cmd ..\build\x64\CecSharpTester.exe
-CALL ..\support\sign-binary.cmd ..\build\x64\libcec.x64.dll
-CALL ..\support\sign-binary.cmd ..\build\x64\LibCecSharp.dll
-CALL ..\support\sign-binary.cmd ..\build\x64\cec-config-gui.exe
+CALL ..\support\private\sign-binary.cmd ..\build\cec-client.exe
+CALL ..\support\private\sign-binary.cmd ..\build\CecSharpTester.exe
+CALL ..\support\private\sign-binary.cmd ..\build\libcec.dll
+CALL ..\support\private\sign-binary.cmd ..\build\LibCecSharp.dll
+CALL ..\support\private\sign-binary.cmd ..\build\cec-config-gui.exe
+CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-client.x64.exe
+CALL ..\support\private\sign-binary.cmd ..\build\x64\CecSharpTester.exe
+CALL ..\support\private\sign-binary.cmd ..\build\x64\libcec.x64.dll
+CALL ..\support\private\sign-binary.cmd ..\build\x64\LibCecSharp.dll
+CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-config-gui.exe
 
 :CREATEINSTALLER
 echo. Creating the installer
@@ -122,9 +122,9 @@ echo. Creating the installer
 IF NOT EXIST "..\build\libCEC-installer.exe" GOTO :ERRORCREATINGINSTALLER
 
 rem Sign the installer if sign-binary.cmd exists
-IF EXIST "..\support\sign-binary.cmd" (
+IF EXIST "..\support\private\sign-binary.cmd" (
   echo. Signing the installer binaries
-  CALL ..\support\sign-binary.cmd ..\build\libCEC-installer.exe
+  CALL ..\support\private\sign-binary.cmd ..\build\libCEC-installer.exe
 )
 
 echo. The installer can be found here: ..\build\libCEC-installer.exe