From 5b4e67dadbedb6e5ad7e6b8a5e898a1dcac7db66 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 6 Mar 2018 16:39:23 +0000 Subject: [PATCH] wip #819 @2 --- ...rtificateSigningRequest.certSigningRequest | 16 ++++ .../developerID_application.cer | Bin 0 -> 1400 bytes .../developerID_application.p12 | Bin 0 -> 3005 bytes .../developerID_application.pem | 67 +++++++++++++++ .../vincent@cubedesigners.com.key | 27 ++++++ ...rtificateSigningRequest.certSigningRequest | 16 ++++ .../developerID_installer.cer | Bin 0 -> 1399 bytes .../developerID_installer.p12 | Bin 0 -> 2997 bytes .../developerID_installer.pem | 67 +++++++++++++++ .../vincent@cubedesigners.com.key | 27 ++++++ inc/config.inc.php | 1 + inc/ws/Controlleur/_common.php | 2 - inc/ws/Controlleur/class.ws.maintenance.php | 8 +- .../html5/master/class.ws.html5.compiler.php | 10 ++- inc/ws/Util/packager/_common.php | 11 ++- inc/ws/Util/packager/class.ws.packager.php | 8 ++ .../class.ws.packager.win.exe.html.php | 77 ++++++++++++++++++ .../class.ws.packager.win.inst.html.php | 72 ++++++++++++++++ 18 files changed, 402 insertions(+), 7 deletions(-) create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_application/CertificateSigningRequest.certSigningRequest create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.cer create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.p12 create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.pem create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_application/vincent@cubedesigners.com.key create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_installer/CertificateSigningRequest.certSigningRequest create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_installer/developerID_installer.cer create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_installer/developerID_installer.p12 create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_installer/developerID_installer.pem create mode 100644 fluidbook/compile/_exehtml/certificats/developer_id_installer/vincent@cubedesigners.com.key create mode 100644 inc/ws/Util/packager/class.ws.packager.win.exe.html.php create mode 100644 inc/ws/Util/packager/class.ws.packager.win.inst.html.php diff --git a/fluidbook/compile/_exehtml/certificats/developer_id_application/CertificateSigningRequest.certSigningRequest b/fluidbook/compile/_exehtml/certificats/developer_id_application/CertificateSigningRequest.certSigningRequest new file mode 100644 index 000000000..808d7cd5e --- /dev/null +++ b/fluidbook/compile/_exehtml/certificats/developer_id_application/CertificateSigningRequest.certSigningRequest @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICkDCCAXgCAQAwSzFJMEcGCSqGSIb3DQEJARY6dmluY2VudEBjdWJlZGVzaWdu +ZXJzLmNvbSwgQ049VmluY2VudCBWYW53YWVsc2NhcHBlbCwgQz1GUjCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+AuVzs23zgJaARe9KzejKeUFlS3mWI +3+6GmNaYUIHs0AoNW97BYsuQ1DFyc4tShOagVtsuLoUFctjE5v355P0zjzoM+0sI +NR3h6hBmPL44UQAiQGPwCuJC+h9ix029vpIltmuwuPtAiLKSv+rSTNMfK++bNqNr +/dUgdiiTCdBMcFcXyMZVW2Bpz8bgVyLuowvt1H7A+txQFIZ2TgWpl4KXwKuMrpAb +NfqY1wbjEVGnAXSXOonkSEcrvj3VZJgDDXa0rWfaiVVnv1gSZGUP4BxaXkCPAN+6 +8DVbhPSKdQ5NLXUVI+QaoVqzt2zEzdvLA5QYPTpIsgoFxD/2C4LO+K0CAwEAAaAA +MA0GCSqGSIb3DQEBCwUAA4IBAQCsVqoQbesVNCTYh5AJ88JBGod82aHZaydlXh85 +BN0/CRcWzbkfMOceOvxWGkItnltTu+eXuHQLnKWiUSImkyKZ/CRDrZuM9Fsq7xF6 +PkIYoSdrHNw63ew+6Mn7AuvQV4GCbzSjJAE7zsVnqrDeX0kLSWTZytAZ/hnXMpoq +Ej4PwmAYn1U5/WKAMfyTq1tHtk6tjNaW0HH1u6YXC/yGlNDjx8EJu3fukefHdpkj +/Yj4G208EMEq4HE+bgri25ox/V/SNGxv0nV+BasUgmskZxL1E546Vodtb0KXzvwW +sC/EsVeKQ48MY0DIwHq+QfvH7jpdS+GLI1Vu59I05FES930a +-----END CERTIFICATE REQUEST----- diff --git a/fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.cer b/fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.cer new file mode 100644 index 0000000000000000000000000000000000000000..bb608d0f5ea9bc7f61912ed4ff066816f77e3e45 GIT binary patch literal 1400 zcmXqLVl6RfVu@M6%*4pV#Nm}GBr`ux!LhU?BfluKq|#8$Kn0|nn@85Mpdcp| zr#fK+L6ABw9xjMF&%9(kLv903kRY2dQ)sY(oH(zcg@LhwnW3S9xv@o*IIod0kZTU* z8Z=HdlroTD6#N8$+?grTgb+wg(b7@j) zN@{UtdR}T#v4RFdx27S~ecUK!iW!JN9LHd~zi_o_mf#$?V5J_X_8Cys?iCuE*K_8?s8-D2*y zSLzP@x)UJMR_4dLa(dJB1FL)1O^`PIHRC$lW5K}Xj3v{pI-hvBYwxqYnlgi#w`|MW z^jn>w>H8yuQd0RJ$VA0C^fTPw^}#f{$HF*!N4pah~P z4X7s-g!2?YRsa)m5-@)i17%YZi&7LyQj2nd8uC&UlJoOYGC|q0SRp@6p|m(v2gRa- ze4t*CWk8j1`$3twpeQl9BopX7pqVA9xv6<2#d-$d@ZbjpAPX}SdxL=(D11~wd>#WX zm;Q&0u=GGJOn}*dks&%XYE%47wkgMqXWR>tnc z#2NE$RhONy(G^M4O$E3V7jjJ5z3}3Cpo;p{C}{)Pf%m46r3 zL^mBex%g+%^|fAGCK}j3I2tY=B>gSNvT9n}neNHcu6V5Y^DFC2N%^1ddVaSJ7T1^9 zPOz)u=<>eU9W|?MYS6E&{fgS$W$$MdFndSOP1f>XH0Ah}f)ATgf7F~8czSdy&;CWL sX6v|4fAKxY@3Nm{mf6Fi(+B^v>-076WsTN3aXkBPTAhfxYI1cv07s+mc>n+a literal 0 HcmV?d00001 diff --git a/fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.p12 b/fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.p12 new file mode 100644 index 0000000000000000000000000000000000000000..0e9f0b360c5e6445feaac4008222a20a85610845 GIT binary patch literal 3005 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 literal 0 HcmV?d00001 diff --git a/fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.pem b/fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.pem new file mode 100644 index 000000000..9cbfce380 --- /dev/null +++ b/fluidbook/compile/_exehtml/certificats/developer_id_application/developerID_application.pem @@ -0,0 +1,67 @@ +Bag Attributes + localKeyID: 0E A0 70 D2 26 76 A4 AA 26 64 C5 27 9A 3B 46 49 BB 69 52 3F +subject=/UID=82TNE4UQ7A/CN=Developer ID Application: Cubedesigners (82TNE4UQ7A)/OU=82TNE4UQ7A/O=Cubedesigners/C=US +issuer=/CN=Developer ID Certification Authority/OU=Apple Certification Authority/O=Apple Inc./C=US +-----BEGIN CERTIFICATE----- +MIIFdDCCBFygAwIBAgIISmkSRgQmbSwwDQYJKoZIhvcNAQELBQAweTEtMCsGA1UE +AwwkRGV2ZWxvcGVyIElEIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSYwJAYDVQQL +DB1BcHBsZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUg +SW5jLjELMAkGA1UEBhMCVVMwHhcNMTgwMzA2MTEwNzM4WhcNMjMwMzA3MTEwNzM4 +WjCBlTEaMBgGCgmSJomT8ixkAQEMCjgyVE5FNFVRN0ExPTA7BgNVBAMMNERldmVs +b3BlciBJRCBBcHBsaWNhdGlvbjogQ3ViZWRlc2lnbmVycyAoODJUTkU0VVE3QSkx +EzARBgNVBAsMCjgyVE5FNFVRN0ExFjAUBgNVBAoMDUN1YmVkZXNpZ25lcnMxCzAJ +BgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr4C5XOzb +fOAloBF70rN6Mp5QWVLeZYjf7oaY1phQgezQCg1b3sFiy5DUMXJzi1KE5qBW2y4u +hQVy2MTm/fnk/TOPOgz7Swg1HeHqEGY8vjhRACJAY/AK4kL6H2LHTb2+kiW2a7C4 ++0CIspK/6tJM0x8r75s2o2v91SB2KJMJ0ExwVxfIxlVbYGnPxuBXIu6jC+3UfsD6 +3FAUhnZOBamXgpfAq4yukBs1+pjXBuMRUacBdJc6ieRIRyu+PdVkmAMNdrStZ9qJ +VWe/WBJkZQ/gHFpeQI8A37rwNVuE9Ip1Dk0tdRUj5BqhWrO3bMTN28sDlBg9Okiy +CgXEP/YLgs74rQIDAQABo4IB4TCCAd0wPgYIKwYBBQUHAQEEMjAwMC4GCCsGAQUF +BzABhiJodHRwOi8vb2NzcC5hcHBsZS5jb20vb2NzcC1kZXZpZDAxMB0GA1UdDgQW +BBQ2lm4L1Wbn/kR3Ghdt+LisS0XgPTAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaA +FFcX7aLP3HyYoRDg/L6HLSzy4xdUMIIBDgYDVR0gBIIBBTCCAQEwgf4GCSqGSIb3 +Y2QFATCB8DAoBggrBgEFBQcCARYcaHR0cDovL3d3dy5hcHBsZS5jb20vYXBwbGVj +YTCBwwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRl +IGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBw +bGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNl +cnRpZmljYXRlIHBvbGljeSBhbmQgY2VydGlmaWNhdGlvbiBwcmFjdGljZSBzdGF0 +ZW1lbnRzLjAOBgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwMw +EwYKKoZIhvdjZAYBDQEB/wQCBQAwDQYJKoZIhvcNAQELBQADggEBAFtVWrJfmQaU +xjOY3lIcmExgxFWzGljMN4slRLldW3hilzUQCiGhCJS7odGvEto3tl0tRPRfcqJS +bwTkVrXEebouRauMIAW8mBa86hIARAa2VahxKSmZZXD44cPBWrx+pPLcKeCOmJvg +HKflSwzYIyTjbC6eLRrwOBWywsmj+XLXrUq0kTA/4MVXH1Ib9mw5epaGzIuTltRI +qPz6asx0d/yLfw9GsDjXpD2QPnoIikvRi1qahpVS+mq/ISsLdu+acANLW51jKk+i +lMfUcPCyZfh8zxDlxZUMv6KqmyxFl+j3Uk7TThlqNuFyy8H/ByyOg70FWyzIx2v9 +Zn4UJyVje18= +-----END CERTIFICATE----- +Bag Attributes + localKeyID: 0E A0 70 D2 26 76 A4 AA 26 64 C5 27 9A 3B 46 49 BB 69 52 3F +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvgLlc7Nt84CWg +EXvSs3oynlBZUt5liN/uhpjWmFCB7NAKDVvewWLLkNQxcnOLUoTmoFbbLi6FBXLY +xOb9+eT9M486DPtLCDUd4eoQZjy+OFEAIkBj8AriQvofYsdNvb6SJbZrsLj7QIiy +kr/q0kzTHyvvmzaja/3VIHYokwnQTHBXF8jGVVtgac/G4Fci7qML7dR+wPrcUBSG +dk4FqZeCl8CrjK6QGzX6mNcG4xFRpwF0lzqJ5EhHK7491WSYAw12tK1n2olVZ79Y +EmRlD+AcWl5AjwDfuvA1W4T0inUOTS11FSPkGqFas7dsxM3bywOUGD06SLIKBcQ/ +9guCzvitAgMBAAECggEAQkXtuXWH/MP38VYo2AwGXQ8DcHemm9jwFvakyISEAkwW +03Tv+FI2qIBsYK/Dih0DKsPpiKML1heUot7YC5hOLH9H2rgEPPVAeaRR6xdwYLSL +ge1tO0/uDDsWkLuQX38Dc9Th6hC2Ccr409YuutHnSOJAiR6np1akZ9L2S6Qa1Jko +wzusNDCDf+2hf1THY0M4LJnLpw+Xb9aOaUB2WQ9Q3wXGSce4Q5HhW8JG/at8a7iD +yoXXOd41gp8x/JvJTiAFn/hlLWR7v0PccZDcWO5nGl/nouCWoZGVkRCKOACZKapc +ZL82I/sjEfnA2UyRJ5Fu8QRRsNiTo4ZagiUfKryl0QKBgQDYqNJiiKeotaGRaKNl +rE/qj+6RmSfsCHSmocJYt1HpiMeS4z8ZcpdnjvzHIaOpzUN1S/5O8rhxJW9aSdFr +qukZuVJHC0IlueNhyd7IL6m+XJyeJ02L6kL2PANresw04Njm81oJDE3YnEgwjTaK +lTyFT+Zmvnwc8zSUg7SdHigYkwKBgQDPXsf9w+X5Vaho72gc3hO9qIoz82z3KnBS +dlyoHzz4rbwY7tiBbVm3WzpiPIcW1wzzR7zGr2dDp7+8Vi9bbNwtwCLAAeEo2sli +q+WYN8U3TGRlftWHo5TIqp+GFbSjn+h7eokM0xHaMYXFpu/tv28FS7ujCjITScXp +LqrDgd2xvwKBgQCGx1bBRyONNxhAPajP+gZo84rEdlM4aPYwJpag28GQFq+YN9er ++/YlzPSA5/NJEVDyqgiUkjec413G+/7UDKkfgIKngWBv2ZiS36LAQ65DppcjZ229 +KUjopuK1vNlF1832tdH/qPDQXEAoO+B/C2FvyQmaRsssszq1XM1BpF3rEwKBgBFR +SABQOMdeuOayf45RmXJwPcJi5MmrWJ/6VHiRy0S1NY0bfScp26EtVC3aAioNIX67 +ke9BvKzwuFlhFSlcaPLFJeHFBmmkA8ditZTFq4mXrpavRePC7GzpmtLWwzQa6Y5O +SF2yzr3a/uHntAe1we6+SVgvRMlJkuaLSCV1le7/AoGAaZpvCGbmrsmI9tqeY7n1 +V0Rt7XonGFV25gIJILAy0fJJAgFFEUr81sasrd9u9Y614+SNwwkSufA7eQe8EuL3 +WYN/TigD3MH9Lap5MqnJt40bRSk1KrglOGHhD/ffFQB7BLIgfDpC8f1F17eCwpfq +dIS4wArzLhQY9ASdaXgkU9I= +-----END PRIVATE KEY----- diff --git a/fluidbook/compile/_exehtml/certificats/developer_id_application/vincent@cubedesigners.com.key b/fluidbook/compile/_exehtml/certificats/developer_id_application/vincent@cubedesigners.com.key new file mode 100644 index 000000000..7bc8d97da --- /dev/null +++ b/fluidbook/compile/_exehtml/certificats/developer_id_application/vincent@cubedesigners.com.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAr4C5XOzbfOAloBF70rN6Mp5QWVLeZYjf7oaY1phQgezQCg1b +3sFiy5DUMXJzi1KE5qBW2y4uhQVy2MTm/fnk/TOPOgz7Swg1HeHqEGY8vjhRACJA +Y/AK4kL6H2LHTb2+kiW2a7C4+0CIspK/6tJM0x8r75s2o2v91SB2KJMJ0ExwVxfI +xlVbYGnPxuBXIu6jC+3UfsD63FAUhnZOBamXgpfAq4yukBs1+pjXBuMRUacBdJc6 +ieRIRyu+PdVkmAMNdrStZ9qJVWe/WBJkZQ/gHFpeQI8A37rwNVuE9Ip1Dk0tdRUj +5BqhWrO3bMTN28sDlBg9OkiyCgXEP/YLgs74rQIDAQABAoIBAEJF7bl1h/zD9/FW +KNgMBl0PA3B3ppvY8Bb2pMiEhAJMFtN07/hSNqiAbGCvw4odAyrD6YijC9YXlKLe +2AuYTix/R9q4BDz1QHmkUesXcGC0i4HtbTtP7gw7FpC7kF9/A3PU4eoQtgnK+NPW +LrrR50jiQIkep6dWpGfS9kukGtSZKMM7rDQwg3/toX9Ux2NDOCyZy6cPl2/WjmlA +dlkPUN8FxknHuEOR4VvCRv2rfGu4g8qF1zneNYKfMfybyU4gBZ/4ZS1ke79D3HGQ +3FjuZxpf56LglqGRlZEQijgAmSmqXGS/NiP7IxH5wNlMkSeRbvEEUbDYk6OGWoIl +Hyq8pdECgYEA2KjSYoinqLWhkWijZaxP6o/ukZkn7Ah0pqHCWLdR6YjHkuM/GXKX +Z478xyGjqc1DdUv+TvK4cSVvWknRa6rpGblSRwtCJbnjYcneyC+pvlycnidNi+pC +9jwDa3rMNODY5vNaCQxN2JxIMI02ipU8hU/mZr58HPM0lIO0nR4oGJMCgYEAz17H +/cPl+VWoaO9oHN4TvaiKM/Ns9ypwUnZcqB88+K28GO7YgW1Zt1s6YjyHFtcM80e8 +xq9nQ6e/vFYvW2zcLcAiwAHhKNrJYqvlmDfFN0xkZX7Vh6OUyKqfhhW0o5/oe3qJ +DNMR2jGFxabv7b9vBUu7owoyE0nF6S6qw4Hdsb8CgYEAhsdWwUcjjTcYQD2oz/oG +aPOKxHZTOGj2MCaWoNvBkBavmDfXq/v2Jcz0gOfzSRFQ8qoIlJI3nONdxvv+1Ayp +H4CCp4Fgb9mYkt+iwEOuQ6aXI2dtvSlI6KbitbzZRdfN9rXR/6jw0FxAKDvgfwth +b8kJmkbLLLM6tVzNQaRd6xMCgYARUUgAUDjHXrjmsn+OUZlycD3CYuTJq1if+lR4 +kctEtTWNG30nKduhLVQt2gIqDSF+u5HvQbys8LhZYRUpXGjyxSXhxQZppAPHYrWU +xauJl66Wr0Xjwuxs6ZrS1sM0GumOTkhdss692v7h57QHtcHuvklYL0TJSZLmi0gl +dZXu/wKBgGmabwhm5q7JiPbanmO59VdEbe16JxhVduYCCSCwMtHySQIBRRFK/NbG +rK3fbvWOtePkjcMJErnwO3kHvBLi91mDf04oA9zB/S2qeTKpybeNG0UpNSq4JThh +4Q/33xUAewSyIHw6QvH9Rde3gsKX6nSEuMAK8y4UGPQEnWl4JFPS +-----END RSA PRIVATE KEY----- diff --git a/fluidbook/compile/_exehtml/certificats/developer_id_installer/CertificateSigningRequest.certSigningRequest b/fluidbook/compile/_exehtml/certificats/developer_id_installer/CertificateSigningRequest.certSigningRequest new file mode 100644 index 000000000..e9da5d408 --- /dev/null +++ b/fluidbook/compile/_exehtml/certificats/developer_id_installer/CertificateSigningRequest.certSigningRequest @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICkDCCAXgCAQAwSzFJMEcGCSqGSIb3DQEJARY6dmluY2VudEBjdWJlZGVzaWdu +ZXJzLmNvbSwgQ049VmluY2VudCBWYW53YWVsc2NhcHBlbCwgQz1GUjCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKWYY+C+mmZiLvjIAIQgkoF8L426k5rZ +VsWqBBd1TAwCQzBE3ipmFpRc/6+wJRM/GXvij42PL2GwXop1GoAfnonzA8iHOWgT +Anm9TZL+8aB5V1Que8MCXMVVrnM9rdWeRzPCpHejcWz/6lfYAbOStig4gPORla+a +2lYVTVbyD7/OkgCDMTMaN2Ooh2jInBA775UxS0ihUQr9LB3Vkdf53OfnZGVWvTV8 +YZBo7rOB9tDMRrmCOpyLhIbpSa6xdfHrSo2XYrf/R8SqOyHds5tghzjyf7u7/rmi ++y5rGhQLPEUj8tTLoybs6kocVqEbaRuopPPktkIZgfUtDliwxDCh4EUCAwEAAaAA +MA0GCSqGSIb3DQEBCwUAA4IBAQBMfQbjXEvqUemUVRuWxLCeykeMSkDKyZjaLpjQ +G2CQ31umWHmlZkLcd9FZwokmKiqINDZV8xJt66QxD4I9/BQ2g7rJ68fyQRduJqiw +TIxkiQZLiUtjdSjwfrJ1jEgFA9ismmBEHDgK0rCmbLnWzIWGYlKbptWGYCci1QwZ +lpJqNLUOyCWXfjTC9gej7oB+dtaFJm8SKVAwj/BHXhTy/gQCgWhmMLGocV7gFDY0 +Brd6AVjb/BFQJ+Jkc6Jie15bNs1nrFmrWVvx0Wa5T35+VUfuhuC6H4AQ88XWZs9Y +OJTU4wH7NKCGUXxedBYQX2Rn8J3o6IHYxxHHbmA54RTANolx +-----END CERTIFICATE REQUEST----- diff --git a/fluidbook/compile/_exehtml/certificats/developer_id_installer/developerID_installer.cer b/fluidbook/compile/_exehtml/certificats/developer_id_installer/developerID_installer.cer new file mode 100644 index 0000000000000000000000000000000000000000..44bed5ee2b9824464e0be52db5dc4b50228b53ce GIT binary patch literal 1399 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 literal 0 HcmV?d00001 diff --git a/fluidbook/compile/_exehtml/certificats/developer_id_installer/developerID_installer.pem b/fluidbook/compile/_exehtml/certificats/developer_id_installer/developerID_installer.pem new file mode 100644 index 000000000..6aa879074 --- /dev/null +++ b/fluidbook/compile/_exehtml/certificats/developer_id_installer/developerID_installer.pem @@ -0,0 +1,67 @@ +Bag Attributes + localKeyID: CC 5E 0F 9A 6B 24 A2 6E FC 69 EF DC 4F 7A 54 DC DF DC 68 55 +subject=/UID=82TNE4UQ7A/CN=Developer ID Installer: Cubedesigners (82TNE4UQ7A)/OU=82TNE4UQ7A/O=Cubedesigners/C=US +issuer=/CN=Developer ID Certification Authority/OU=Apple Certification Authority/O=Apple Inc./C=US +-----BEGIN CERTIFICATE----- +MIIFczCCBFugAwIBAgIIVHMQKyi5DP0wDQYJKoZIhvcNAQELBQAweTEtMCsGA1UE +AwwkRGV2ZWxvcGVyIElEIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSYwJAYDVQQL +DB1BcHBsZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUg +SW5jLjELMAkGA1UEBhMCVVMwHhcNMTgwMzA2MTExMTEyWhcNMjMwMzA3MTExMTEy +WjCBkzEaMBgGCgmSJomT8ixkAQEMCjgyVE5FNFVRN0ExOzA5BgNVBAMMMkRldmVs +b3BlciBJRCBJbnN0YWxsZXI6IEN1YmVkZXNpZ25lcnMgKDgyVE5FNFVRN0EpMRMw +EQYDVQQLDAo4MlRORTRVUTdBMRYwFAYDVQQKDA1DdWJlZGVzaWduZXJzMQswCQYD +VQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKWYY+C+mmZi +LvjIAIQgkoF8L426k5rZVsWqBBd1TAwCQzBE3ipmFpRc/6+wJRM/GXvij42PL2Gw +Xop1GoAfnonzA8iHOWgTAnm9TZL+8aB5V1Que8MCXMVVrnM9rdWeRzPCpHejcWz/ +6lfYAbOStig4gPORla+a2lYVTVbyD7/OkgCDMTMaN2Ooh2jInBA775UxS0ihUQr9 +LB3Vkdf53OfnZGVWvTV8YZBo7rOB9tDMRrmCOpyLhIbpSa6xdfHrSo2XYrf/R8Sq +OyHds5tghzjyf7u7/rmi+y5rGhQLPEUj8tTLoybs6kocVqEbaRuopPPktkIZgfUt +DliwxDCh4EUCAwEAAaOCAeIwggHeMD4GCCsGAQUFBwEBBDIwMDAuBggrBgEFBQcw +AYYiaHR0cDovL29jc3AuYXBwbGUuY29tL29jc3AtZGV2aWQwMjAdBgNVHQ4EFgQU +btWNIgYobf4neaFu1TkNIGJvk6AwDAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBRX +F+2iz9x8mKEQ4Py+hy0s8uMXVDCCAQ4GA1UdIASCAQUwggEBMIH+BgkqhkiG92Nk +BQEwgfAwKAYIKwYBBQUHAgEWHGh0dHA6Ly93d3cuYXBwbGUuY29tL2FwcGxlY2Ew +gcMGCCsGAQUFBwICMIG2DIGzUmVsaWFuY2Ugb24gdGhpcyBjZXJ0aWZpY2F0ZSBi +eSBhbnkgcGFydHkgYXNzdW1lcyBhY2NlcHRhbmNlIG9mIHRoZSB0aGVuIGFwcGxp +Y2FibGUgc3RhbmRhcmQgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdXNlLCBjZXJ0 +aWZpY2F0ZSBwb2xpY3kgYW5kIGNlcnRpZmljYXRpb24gcHJhY3RpY2Ugc3RhdGVt +ZW50cy4wDgYDVR0PAQH/BAQDAgeAMBcGA1UdJQEB/wQNMAsGCSqGSIb3Y2QEDTAT +BgoqhkiG92NkBgEOAQH/BAIFADANBgkqhkiG9w0BAQsFAAOCAQEAHqlpDhdZN+nr +lhsfHzKiFGlC2l0Iyr1AZxNUBGrf+FqFt6JjjiO1aYkwPGUCuoetDE+L2wi7g/dv +0TzbmGgx/ykfEhCWNmd5agCtnUyD0Fi7jrd4TBxYd3zqid4Jd+28qYeFwUCsaTAI +5eawBKK74Gf4lbwU8VYWrudbgn+X5pStyKH7gBXNuUJTEiE5ksR9i2uzHik2pAuE +VCPI9Bg6RgxAKZGQDkhFScddgts+/bLFbP1JOHql0agI5KUgxcIDWY3kcdaGS//M +0hgAaiDt0B84KSXexkv3NkFdWQkQCoIZ00zDGpEtt/p+xMVcdPHWrk5utQlfAVyA +GbSOCRw1Lg== +-----END CERTIFICATE----- +Bag Attributes + localKeyID: CC 5E 0F 9A 6B 24 A2 6E FC 69 EF DC 4F 7A 54 DC DF DC 68 55 +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQClmGPgvppmYi74 +yACEIJKBfC+NupOa2VbFqgQXdUwMAkMwRN4qZhaUXP+vsCUTPxl74o+Njy9hsF6K +dRqAH56J8wPIhzloEwJ5vU2S/vGgeVdULnvDAlzFVa5zPa3VnkczwqR3o3Fs/+pX +2AGzkrYoOIDzkZWvmtpWFU1W8g+/zpIAgzEzGjdjqIdoyJwQO++VMUtIoVEK/Swd +1ZHX+dzn52RlVr01fGGQaO6zgfbQzEa5gjqci4SG6UmusXXx60qNl2K3/0fEqjsh +3bObYIc48n+7u/65ovsuaxoUCzxFI/LUy6Mm7OpKHFahG2kbqKTz5LZCGYH1LQ5Y +sMQwoeBFAgMBAAECggEAQ9cvq+ZKWQGGXtOJKpgxjSy0SqsSR5EctHQXowih9BWF +MyQzpEkYnQWQlohiWAU0yoUh7IupjKr1wGGDTtQlXjyZ4zBK+3E2RWuheURK90Re +25UDjPvNx+Z3Rq0RJ3/libYHLSBfmpkph31uDQRg7g9f/Ok62qtlIXkuqx0WCKzO +XAwG+Wk2RnE6Py8jpRGphY89GGKOrPrMrVisuteRn8rAL8xBm+X7HN/j7IjHDYGV +4Un4y/DJQYqYWuGM1mSrQfzEdDk8LaaGUy20/Ew/2u/MtCtB6Yo8Sx7h8+M4xlN0 +1EEdb6VIfPJUgjGGA95l1X7Hs2xVU9en2mgfDRFVwQKBgQDWMyDaTy2rm+KPLeJZ ++Xr6RUOC8V8btgr+U/slGPMuViSDCAM85dl/RztM6sYChQgEDRKA/lJpnqJFuPxM +4P4OnuUZFzu9k6jzgIiXCrtZTFTJoA9P1z2Up7yvJgdBKyGLwSKeqIE0NvlqKMeX +3F0UQiTEoPAlOywt0KjOmlcrsQKBgQDF6RuP9iSrvoxh5A/yKokZBJi8Q4tA/080 +JZWQTlwoMSHHy+gY55Y7K7JUbJe52EtHdhR1BBZeMPtR03WkaK4i1w81qYUN7OaV +JDdoup/vDMygQ6AxF/YS3UPk5rNgeG4sTphrn+P91N3IUY7/d97rP1X2buJb4FVg +nxFCzFJm1QKBgQCimhF4Z97NhPqJolVP4/kc/3NudXizepAB3RKraLNCG5Z/+Zcr +pXhkDFjR3O8PfplFKf8/+M/q6cdZkkHEwo9Z3fkgAOkS0oLQxmPp9PWfpjg/DshQ +3Z4buPGdLAsZx3ohsy1qr5PVZV4U3nwVpezqsgNjWKC0QqUY6msa20MNIQKBgQCH +j2Y7s6Pmp7xMiQSLIauKoWVk/vbxbG96Doxlrebd+Nlkmzy9YlO67/FUdpVuzMKz +jiPxCv2vQunCYI9iL/mnD5vxa84hfbVrTsVNTRejjCbVV7zwI7N/tGN+9K7FU3hT +jPpGLdzizt2jCopiXl8oz9c31zfhKsYQSqRuFroSiQKBgQCJHnpzPtVJq2MKyzNf +kYwmllm7BgbT8VHcEWZqk8wZk+ehZ+thAncLnR16+DASYXMrAehiY/bUPzzYqo4f +eY12r8xdl1i8bcJzzUSIS/J1Qds8nw/qcaSdo8GPP1bGUpBNgLipFW5I0lPvrcby +lCQU64GPcvJa3TVm9yONWvZK/A== +-----END PRIVATE KEY----- diff --git a/fluidbook/compile/_exehtml/certificats/developer_id_installer/vincent@cubedesigners.com.key b/fluidbook/compile/_exehtml/certificats/developer_id_installer/vincent@cubedesigners.com.key new file mode 100644 index 000000000..3939e59b6 --- /dev/null +++ b/fluidbook/compile/_exehtml/certificats/developer_id_installer/vincent@cubedesigners.com.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEApZhj4L6aZmIu+MgAhCCSgXwvjbqTmtlWxaoEF3VMDAJDMETe +KmYWlFz/r7AlEz8Ze+KPjY8vYbBeinUagB+eifMDyIc5aBMCeb1Nkv7xoHlXVC57 +wwJcxVWucz2t1Z5HM8Kkd6NxbP/qV9gBs5K2KDiA85GVr5raVhVNVvIPv86SAIMx +Mxo3Y6iHaMicEDvvlTFLSKFRCv0sHdWR1/nc5+dkZVa9NXxhkGjus4H20MxGuYI6 +nIuEhulJrrF18etKjZdit/9HxKo7Id2zm2CHOPJ/u7v+uaL7LmsaFAs8RSPy1Muj +JuzqShxWoRtpG6ik8+S2QhmB9S0OWLDEMKHgRQIDAQABAoIBAEPXL6vmSlkBhl7T +iSqYMY0stEqrEkeRHLR0F6MIofQVhTMkM6RJGJ0FkJaIYlgFNMqFIeyLqYyq9cBh +g07UJV48meMwSvtxNkVroXlESvdEXtuVA4z7zcfmd0atESd/5Ym2By0gX5qZKYd9 +bg0EYO4PX/zpOtqrZSF5LqsdFgiszlwMBvlpNkZxOj8vI6URqYWPPRhijqz6zK1Y +rLrXkZ/KwC/MQZvl+xzf4+yIxw2BleFJ+MvwyUGKmFrhjNZkq0H8xHQ5PC2mhlMt +tPxMP9rvzLQrQemKPEse4fPjOMZTdNRBHW+lSHzyVIIxhgPeZdV+x7NsVVPXp9po +Hw0RVcECgYEA1jMg2k8tq5vijy3iWfl6+kVDgvFfG7YK/lP7JRjzLlYkgwgDPOXZ +f0c7TOrGAoUIBA0SgP5SaZ6iRbj8TOD+Dp7lGRc7vZOo84CIlwq7WUxUyaAPT9c9 +lKe8ryYHQSshi8EinqiBNDb5aijHl9xdFEIkxKDwJTssLdCozppXK7ECgYEAxekb +j/Ykq76MYeQP8iqJGQSYvEOLQP9PNCWVkE5cKDEhx8voGOeWOyuyVGyXudhLR3YU +dQQWXjD7UdN1pGiuItcPNamFDezmlSQ3aLqf7wzMoEOgMRf2Et1D5OazYHhuLE6Y +a5/j/dTdyFGO/3fe6z9V9m7iW+BVYJ8RQsxSZtUCgYEAopoReGfezYT6iaJVT+P5 +HP9zbnV4s3qQAd0Sq2izQhuWf/mXK6V4ZAxY0dzvD36ZRSn/P/jP6unHWZJBxMKP +Wd35IADpEtKC0MZj6fT1n6Y4Pw7IUN2eG7jxnSwLGcd6IbMtaq+T1WVeFN58FaXs +6rIDY1igtEKlGOprGttDDSECgYEAh49mO7Oj5qe8TIkEiyGriqFlZP728Wxveg6M +Za3m3fjZZJs8vWJTuu/xVHaVbszCs44j8Qr9r0LpwmCPYi/5pw+b8WvOIX21a07F +TU0Xo4wm1Ve88COzf7RjfvSuxVN4U4z6Ri3c4s7dowqKYl5fKM/XN9c34SrGEEqk +bha6EokCgYEAiR56cz7VSatjCsszX5GMJpZZuwYG0/FR3BFmapPMGZPnoWfrYQJ3 +C50devgwEmFzKwHoYmP21D882KqOH3mNdq/MXZdYvG3Cc81EiEvydUHbPJ8P6nGk +naPBjz9WxlKQTYC4qRVuSNJT763G8pQkFOuBj3LyWt01ZvcjjVr2Svw= +-----END RSA PRIVATE KEY----- diff --git a/inc/config.inc.php b/inc/config.inc.php index 9f7a08213..36967ed1a 100644 --- a/inc/config.inc.php +++ b/inc/config.inc.php @@ -38,6 +38,7 @@ define('WS_CACHE', WS_FILES . '/cache'); define('WS_COMPILE_ASSETS', WS_FILES . '/compile'); define('WS_SOUNDS', WS_FILES . '/sounds'); define('WS_TOOLS', WS_FILES . '/tools'); +define('WS_PACKAGER',WS_FILES.'/packager'); define('WORKER_PREFIX', 'worker.'); diff --git a/inc/ws/Controlleur/_common.php b/inc/ws/Controlleur/_common.php index 8eb3c610e..393a32816 100644 --- a/inc/ws/Controlleur/_common.php +++ b/inc/ws/Controlleur/_common.php @@ -9,5 +9,3 @@ $__autoload['wsStats'] = dirname(__FILE__) . '/class.ws.stats.php'; $__autoload['wsServices'] = dirname(__FILE__) . '/class.ws.services.php'; $__autoload['wsUsersTree'] = dirname(__FILE__) . '/class.ws.users.tree.php'; $__autoload['wsMaintenance'] = dirname(__FILE__) . '/class.ws.maintenance.php'; - -?> \ No newline at end of file diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index 7901b37bd..a0ff616b1 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -523,7 +523,7 @@ class wsMaintenance { } public static function cleanPackages() { - $limit = TIME - (2 * 3600); // 4 heures avant maintenant* + $limit = TIME - (2 * 3600); // 2 heures avant maintenant* // $dirs = array( WS_FILES . '/packager/' @@ -614,7 +614,7 @@ class wsMaintenance { continue; } $source = WS_DOCS . '/' . $d . '/'; - $dest = '/mnt/sshfs/batman' . WS_DOCS . '/' . $d . '/'; + $dest = '/data/extranet/www/fluidbook/docs1/' . $d . '/'; if (!file_exists($dest)) { mkdir($dest, 0777, true); } @@ -1556,6 +1556,10 @@ class wsMaintenance { `rm -rf /home/stats/www/objects/$book*;/home/stats/www/FWStats.sh /home/stats/www redobook=$book`; } + + public static function nwbuild($args){ + wsPackager::package(16200,'win-exe-html'); + } } diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php index f8e1d16b5..9047081da 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -548,12 +548,18 @@ class wsHTML5Compiler { $pngFile = $this->themeRoot . '/' . $this->theme->parametres->favicon; $icoFile = $this->themeRoot . '/favicon.ico'; - if (!file_exists($icoFile) || filemtime($icoFile) < filemtime($pngFile)) { + if (!file_exists($icoFile) || filemtime($icoFile) < filemtime($pngFile) || filemtime(__FILE__) > filemtime($icoFile)) { + $tmp = CubeIT_Files::tempnam() . '.png'; + $convert = "convert $pngFile -resize 64x64^ -gravity center $tmp"; + `$convert`; + $icotool = new cubeCommandLine('icotool'); $icotool->setArg('c'); $icotool->setArg('o', $icoFile); - $icotool->setArg(null, $pngFile); + $icotool->setArg(null, $tmp); $icotool->execute(); + + unlink($tmp); } $this->vdir->copy($pngFile, 'data/favicon.png'); $this->vdir->copy($icoFile, 'data/favicon.ico'); diff --git a/inc/ws/Util/packager/_common.php b/inc/ws/Util/packager/_common.php index db43ba1bc..36ff1b463 100644 --- a/inc/ws/Util/packager/_common.php +++ b/inc/ws/Util/packager/_common.php @@ -2,11 +2,20 @@ $__autoload['wsPackager'] = dirname(__FILE__) . '/class.ws.packager.php'; $__autoload['wsPackagerHTML'] = dirname(__FILE__) . '/class.ws.packager.html.php'; + $__autoload['wsPackagerWinEXE'] = dirname(__FILE__) . '/class.ws.packager.win.exe.php'; $__autoload['wsPackagerWinINST'] = dirname(__FILE__) . '/class.ws.packager.win.inst.php'; $__autoload['wsPackagerWinCD'] = dirname(__FILE__) . '/class.ws.packager.win.cd.php'; -$__autoload['wsPackagerWinHTML'] = dirname(__FILE__) . '/class.ws.packager.win.html.php'; $__autoload['wsPackagerMacEXE'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.php'; + +$__autoload['wsPackagerWinEXEHTML'] = dirname(__FILE__) . '/class.ws.packager.win.exe.html.php'; +$__autoload['wsPackagerWinINSTHTML'] = dirname(__FILE__) . '/class.ws.packager.win.inst.html.php'; +$__autoload['wsPackagerWinCDHTML'] = dirname(__FILE__) . '/class.ws.packager.win.cd.html.php'; +$__autoload['wsPackagerMacEXEHTML'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.html.php'; + + +$__autoload['wsPackagerWinHTML'] = dirname(__FILE__) . '/class.ws.packager.win.html.php'; + $__autoload['wsPackagerAIR'] = dirname(__FILE__) . '/class.ws.packager.air.php'; $__autoload['wsPackagerV1'] = dirname(__FILE__) . '/class.ws.packager.v1.php'; $__autoload['wsPackagerPhonegap'] = dirname(__FILE__) . '/class.ws.packager.phonegap.php'; diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php index 35d093c6a..dfbddbd07 100644 --- a/inc/ws/Util/packager/class.ws.packager.php +++ b/inc/ws/Util/packager/class.ws.packager.php @@ -37,6 +37,14 @@ class wsPackager { $packager = new wsPackagerWinHTML($book_id); } else if ($version == 'phonegap') { $packager = new wsPackagerPhonegap($book_id); + } else if ($version == 'win-exe-html') { + $packager = new wsPackagerWinEXEHTML($book_id); + } else if ($version == 'mac-exe-html') { + $packager = new wsPackagerMacEXEHTML($book_id); + } else if ($version == 'win-ins-html') { + $packager = new wsPackagerWinINSTHTML($book_id); + } else if ($version == 'win-cd-html') { + $packager = new wsPackagerWinCDHTML($book_id); } $packager->cleanOnDestruct = $packager->cleanOnDestruct && $cleanOnDestruct; diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php new file mode 100644 index 000000000..200e543d2 --- /dev/null +++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php @@ -0,0 +1,77 @@ +version = 'win-exe-html'; + $this->book->parametres->alwaysHTML5 = true; + $this->appName = ''; + $this->_clean = false; + + if ($this->book->parametres->offlineTitle == "") { + $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 30)); + $this->appName = $this->book->parametres->title; + } else { + $this->exeName = cubeText::str2URL($this->book->parametres->offlineTitle); + $this->appName = $this->book->parametres->offlineTitle; + } + } + + protected function preparePackage() { + parent::preparePackage(); + $this->copyFluidbookFiles(); + //$this->copyOtherFiles(array('Fluidbook.exe' => $this->exeName)); + + $this->makeJSON(); + + $this->buildPath = WS_PACKAGER . '/nwbuild/' . $this->version . '/' . $this->book_id; + if (!file_exists($this->buildPath)) { + mkdir($this->buildPath, 0777, true); + } + + $cl = new CubeIT_CommandLine('/data/extranet/node_modules/nw-builder/bin/nwbuild'); + $cl->setPath(CONVERTER_PATH); + $cl->setArg('p', 'win32'); + $cl->setArg('o', $this->buildPath); + $cl->setArg(null, $this->vdir); + $cl->execute(); + } + + function makeJSON() { + $data = ['app_name' => $this->appName, 'main' => 'index.html', 'name' => $this->exeName, 'version' => '1.0.' . time(), + 'webkit' => [], + 'window' => ['height' => 768, 'width' => 1024, 'title' => $this->appName, 'id' => 'main', 'icon' => 'icon.png', 'mac_icon' => 'icon.icns'] + ]; + file_put_contents($this->vdir . '/package.json', json_encode($data)); + } + + public function makePackage($zip) { + parent::makePackage($zip); + $res = $this->zip(); + $this->postPackage(); + return $res; + } + + public function getFinalPackageDir() { + return $this->buildPath . '/' . $this->exeName . '/win32'; + } + + protected function compile() { + $this->daoBook->compile($this->book_id, 'html5', false, $this->book->parametres->forceCompileOnDownload); + } + + protected function copyFluidbookFiles() { + // Copie du FB vers un répertoire temporaire + $cp = new cubeCommandLine('cp'); + $cp->setArg('R'); + $cp->setArg('p'); + $cp->setArg(null, WS_BOOKS . '/html5/' . $this->book->book_id . '/*'); + $cp->setArg(null, $this->vdir); + $cp->execute(); + } +} \ No newline at end of file diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.html.php b/inc/ws/Util/packager/class.ws.packager.win.inst.html.php new file mode 100644 index 000000000..0318b771f --- /dev/null +++ b/inc/ws/Util/packager/class.ws.packager.win.inst.html.php @@ -0,0 +1,72 @@ +version = 'win-ins-html'; + } + + protected function preparePackage() { + parent::preparePackage(); + + $this->makeNSI(); + } + + protected function makeNSI() { + global $core; + + $winvdir = $this->getFinalPackageDir(); + + $daoLang = new wsDAOLang($core->con); + $lang = $daoLang->selectById($this->book->lang); + + if ($lang->nsis == 'Arabic') { + $lang->nsis = 'English'; + } + + if (!file_exists(WS_FILES . '/packager/download')) { + mkdir(WS_FILES . '/packager/download', 0777, true); + } + + + $fname = $this->exeName; + $title = $this->appName; + + $nsi = file_get_contents(WS_COMPILE_ASSETS . '/script.nsi'); + $nsi = str_replace('$name', utf8_decode($title), $nsi); + $nsi = str_replace('$htmldir', utf8_decode(WS_COMPILE_ASSETS), $nsi); + $nsi = str_replace('$fname', $fname, $nsi); + $nsi = str_replace('$fdir', $winvdir, $nsi); + $nsi = str_replace('$titre', utf8_decode($title), $nsi); + $nsi = str_replace('$lang', utf8_decode($lang->nsis), $nsi); + $nsi = str_replace('$nsisdir', '/usr/share/nsis', $nsi); + $nsi = str_replace('$output', $this->getPathBase('exe'), $nsi); + $favicon = $this->vdir . 'data/favicon.ico'; + if ($this->theme->parametres->favicon == '') { + $this->copy(WS_COMPILE_ASSETS . '/fluidbook.ico', $favicon); + } + $nsi = str_replace('$favicon', $favicon, $nsi); + + $this->nsi = $nsi; + } + + public function makePackage($zip) { + $this->preparePackage(); + + $tmp = cubeFiles::tempnam(); + file_put_contents($tmp, $this->nsi); + $makensis = new CubeIT_CommandLine('makensis'); + $makensis->setArg(null, $tmp); + $makensis->execute(); + + return $this->getURLBase('exe'); + } + + public function __destruct() { + + } + +} \ No newline at end of file -- 2.39.5