Commit Graph

239 Commits

Author SHA1 Message Date
jonpas
b708c5dd4e Fixed zipping the zip, improved zip name definition 2015-06-17 22:05:16 +02:00
jonpas
d210c3b009 Fixed make.py release zip archive 2015-06-17 21:21:35 +02:00
jonpas
59a3e1a451 Automated version change in make.py 2015-06-17 20:42:11 +02:00
ViperMaul
4a12f53855 Merge pull request #1359 from jonpas/setupVars
Added maindir, projectdir and cba variables to setup.py
2015-05-24 13:13:58 -07:00
jonpas
0771ab21b6 Capitalized previously missed global 2015-05-24 22:12:56 +02:00
jonpas
88c57780fc Capitalized globals 2015-05-24 22:09:28 +02:00
ViperMaul
84584fa0b0 Merge pull request #1358 from jonpas/buildVars
Added mainprefix and prefix variables to build.py
2015-05-24 13:08:31 -07:00
jonpas
72abe20f58 Capitalized globals 2015-05-24 22:07:12 +02:00
jonpas
8bf1abadb3 New-school .format, more absolutes changed to variables 2015-05-23 02:48:32 +02:00
jonpas
7cf64c7a52 New-school .format 2015-05-23 02:34:55 +02:00
jonpas
defe356940 New-school .format, Fixed prefix 2015-05-23 02:26:48 +02:00
jonpas
cc70d6808c Added fulldir and cba variables to initial ouput text 2015-05-22 20:20:47 +02:00
jonpas
0b70c04468 Added maindir, projectdir and cba variables 2015-05-22 20:12:41 +02:00
jonpas
02580d510d Added mainprefix and prefix variables
Fixed prefix variable values
2015-05-22 19:59:56 +02:00
jonpas
361cfc8802 Changed absolute make.py paths to read from variables 2015-05-22 19:21:29 +02:00
ViperMaul
66f5ed43c0 More help on certain errors in make.py 2015-05-12 07:05:48 -07:00
ViperMaul
50abf64359 Do not execute CfgConvert if $NOBIN$ is found.
#1107
2015-05-11 12:53:49 -07:00
ViperMaul
59d6e84fc0 Use abbreviated public key to minimize a BI bug.
REFERENCE: http://feedback.arma3.com/view.php?id=22133
Always copy public key in case it is missing from the release folder.
#1105
2015-05-11 10:43:05 -07:00
ViperMaul
5092d586fd Exception handling and clean up.
#1105
2015-05-11 10:06:40 -07:00
ViperMaul
a7a76d69ae Read ACE VERSION from main/script_mod.hpp
#1105
2015-05-11 09:48:47 -07:00
ViperMaul
cf6846dac2 Improve exception handling
#1105
2015-05-11 00:34:32 -07:00
ViperMaul
46cabb14ad Remove unnecessary return so that it can move to the next PBO after missing $PBOPREFIX$
#1105
2015-05-10 23:49:40 -07:00
ViperMaul
d03203d3d5 remove debug
#1105
2015-05-10 22:20:29 -07:00
ViperMaul
0e36e56c1c Proper handling $PBOPREFIX$ backups and cleanup if canceled.
#1105
2015-05-10 22:12:57 -07:00
ViperMaul
4d56e6317c Warn builder for missing $PBOPREFIX$
#1105
2015-05-10 19:58:32 -07:00
ViperMaul
097d0cb8ed Update $PBOPREFIX$ with Commit ID for each PBO
#1105
2015-05-10 19:44:24 -07:00
ViperMaul
2ffc38ddd2 Do not build common every time
#1105
2015-05-10 18:21:01 -07:00
ViperMaul
97105c5b07 Change ACE is version stamp. Example. You will now see ACE is version 3.0.0.2
Initial prep for showing Commit ID for each PBO in #1105
2015-05-10 18:16:27 -07:00
ViperMaul
9be22ee8b5 Merge pull request #1088 from acemod/makeNOBIN_improvements
Make Improvements
2015-05-10 11:46:16 -07:00
ViperMaul
7012b32b55 Display the most likely resolution to the Error FAILED TO DETERMINE COMMIT ID. 2015-05-10 07:56:56 -07:00
ViperMaul
1cc5bd1c50 removing unneeded debug files 2015-05-10 07:41:24 -07:00
ViperMaul
071f40eb2f Remove obsolete *.dll files
#1038
2015-05-09 12:15:18 -07:00
ViperMaul
70e1310d28 Give builders a clue where to look to find what the cause for the error may be.
#1051
2015-05-09 11:29:42 -07:00
ViperMaul
21ea667463 $NOBIN$ file must not be a zero-byte file in order to affect the cache to trigger a proper rebuild. 2015-05-09 11:07:27 -07:00
ViperMaul
ec2d3ff99d add some debug 2015-05-09 11:05:35 -07:00
ViperMaul
e56089737b $NOBIN$ mode now respects the signature key blacklist 2015-05-09 10:30:58 -07:00
KoffeinFlummi
53360ff0a7 Add some more descriptive output to deploy.py 2015-05-08 20:40:40 +02:00
KoffeinFlummi
38b03e2b18 Only commit if there's something to do 2015-05-08 19:37:14 +02:00
KoffeinFlummi
6d44889292 Add deploy script 2015-05-08 19:27:58 +02:00
KoffeinFlummi
24505f59e1 Add option to stringtablediag to only show markdown 2015-05-08 19:27:42 +02:00
ViperMaul
e63b543c5a Added blacklist for server.pbo signature keys
#1032
2015-05-06 14:05:11 -07:00
ViperMaul
a80b180f08 Perform optionals clean up on success, failure or cancel
#1032
2015-05-06 12:13:46 -07:00
ViperMaul
873ae72864 Perform config cleanup on success or cancel
#1032
2015-05-06 11:56:09 -07:00
ViperMaul
ea7a1c30eb Ability to set the test directory, the location you want the final files copied to for testing. Default: %USERPROFILE%\documents\Arma 3\<project> 2015-05-04 13:36:23 -07:00
ViperMaul
1f5e47b7c1 PyFormat.Info love 2015-05-03 07:21:27 -07:00
ViperMaul
d9bd98bf60 Merge pull request #983 from acemod/setVersionMakeCFG
set new default key for make.cfg
2015-05-01 23:50:52 -07:00
ViperMaul
12e05cc526 set new default key 2015-05-01 23:46:22 -07:00
KoffeinFlummi
e6de0d5906 Set version in make.py 2015-05-02 00:54:29 +02:00
KoffeinFlummi
cec16d6a44 3 > 2 2015-04-29 12:58:02 +02:00
ViperMaul
e6062d577a Moving some notices around. 2015-04-24 15:08:19 -07:00
ViperMaul
4c9b94912a Adding notification 2015-04-24 14:46:47 -07:00
ViperMaul
97a4bab70c Fixed a typo 2015-04-24 14:44:57 -07:00
ViperMaul
732e7cc28f remove obsolete PBOs and their signatures during the build process. 2015-04-24 14:43:30 -07:00
ViperMaul
8e62a0bf8f Fixed: make.py looking for private key in the wrong area 2015-04-24 13:25:40 -07:00
ViperMaul
9fc14de251 Merge pull request #827 from acemod/makeEnhancements
Make Signature Key Building + enhancements
2015-04-24 12:36:24 -07:00
ulteq
5e766835a6 Improved regex matching 2015-04-24 13:11:43 +02:00
ulteq
3747df3ec5 Added python script that finds never used privates 2015-04-24 11:54:17 +02:00
ViperMaul
898048eb95 Moved "copy_important_files" call in front of make release and after building is done
Moved "cleanup_optionals" call in front of make release and after building is done
2015-04-23 14:53:49 -07:00
ViperMaul
79269db913 Added a notification for the Check External References setting. 2015-04-23 14:35:33 -07:00
ViperMaul
8f79147323 Fix for missing release folder
#815
2015-04-23 11:22:00 -07:00
ViperMaul
0323e17aac Switch to lower case folder names. 2015-04-23 10:40:39 -07:00
ViperMaul
c5066e24c1 Fix undefined work_drive variable for the default private_key_path
#816
2015-04-23 10:31:17 -07:00
ViperMaul
785a40387a Allow changing private_key creation folder from the default P:\private_keys
#816
2015-04-23 10:28:02 -07:00
ViperMaul
1bf043f9f8 Remove all old signature keys for optionals and keys folders.
#815
2015-04-23 10:16:28 -07:00
ViperMaul
d1b6dfa5c7 Private key creation folder is now P:\private_keys by default.
#816
2015-04-23 10:12:28 -07:00
ViperMaul
082d7543f8 The keys folder containing public keys is now properly in the release @ace folder.
#816
2015-04-23 09:36:23 -07:00
ViperMaul
fa69d899db Too much yellow
#815
2015-04-23 03:58:10 -07:00
ViperMaul
822655835a Cleanup
#815
2015-04-23 03:43:58 -07:00
ViperMaul
4e26a8e29f Make sure Optionals get signed too.
#815
2015-04-23 03:18:06 -07:00
ViperMaul
bb676324b9 A little clean up. 2015-04-22 20:09:52 -07:00
ViperMaul
9f2d5b9c10 Check for missing keys and rebuild them.
#815
2015-04-22 19:14:03 -07:00
ViperMaul
a87c1deac8 Removing old signature keys when a new key has been created.
#815
2015-04-22 17:45:22 -07:00
ViperMaul
1518ef8d0b Signature keys created by default.
#815
2015-04-22 16:58:29 -07:00
ViperMaul
5c90a44057 Required Python 3 2015-04-22 16:05:28 -07:00
ViperMaul
e605a8dbca Trimming more trailing spaces #783 2015-04-21 10:05:11 -07:00
ViperMaul
ced0d3d576 Removing extra spaces from the end of line #783 2015-04-21 10:02:56 -07:00
ViperMaul
cebe520513 Userconfig folder is now properly added to the release folder for final distribution.
#783
2015-04-21 08:47:55 -07:00
ViperMaul
aabec2aea2 Converting Tabs to Spaces. Confirming UTF-8 2015-04-21 04:02:10 -07:00
ViperMaul
fd7611e982 Merge pull request #773 from acemod/makeImportantFiles
Make.py and Make.cfg ehancements - Copy Important Files
2015-04-20 13:47:02 -07:00
ViperMaul
5793175c1f Fixing issue when release directory is missing
#552
2015-04-19 16:00:34 -07:00
ViperMaul
9c11e47ef4 Missing changes that Git Extensions client left out #552 2015-04-19 15:28:54 -07:00
ViperMaul
ac201d334c Added support for building server.pbo
Added new optionals_root to make.cfg
Updated version
Added global variables. #552
2015-04-19 14:51:51 -07:00
ViperMaul
fe92110b4d Make sure you build missing files.
Even if cache says the source files has not changed.
#735
2015-04-18 19:16:12 -07:00
PabstMirror
43dee5643f Python3 compatibility: parentheses for print 2015-04-18 13:20:10 -05:00
jaynus
34b62a0a86 Print privates declaration for file. 2015-04-18 10:50:16 -07:00
jaynus
11336cdade Merge remote-tracking branch 'origin/master' into guidanceHandoff 2015-04-18 10:37:16 -07:00
ViperMaul
db4de5100d #552 - Copy important files and extensions 2015-04-17 20:23:39 -07:00
PabstMirror
ed2e847247 More Privates 2015-04-17 18:13:09 -05:00
PabstMirror
dce344c85f Ignore Case 2015-04-17 16:51:27 -05:00
PabstMirror
00f26144ec More Privates 2015-04-17 15:45:00 -05:00
ViperMaul
e816907c50 #552 - Tab clean up 2015-04-17 12:21:32 -07:00
ViperMaul
8bfb76c965 #552 - Default: don't check external files 2015-04-17 12:05:49 -07:00
Felix Wiegand
f7de809c67 Merge pull request #673 from acemod/64bit-tools-merge
Make make.py itself support 32-&64-bit systems ...
2015-04-17 19:25:38 +02:00
KoffeinFlummi
3d14b171a6 Make make.py itself support 32-&64-bit systems ...
... because having two different files is dumb.
2015-04-16 19:38:07 +02:00
PabstMirror
e06fd7350e DEFAULT_PARAM KEY_PARAM private check 2015-04-16 12:10:40 -05:00
jaynus
8837355d29 Merge remote-tracking branch 'origin/master' into guidanceHandoff 2015-04-16 10:04:57 -07:00
jaynus
9db256ad8d ignore preceeding numbers 2015-04-16 09:54:52 -07:00
jaynus
3c4a3c67db Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 09:48:27 -07:00
jaynus
9d87f08aa6 Regex's kill kids. 2015-04-16 09:48:21 -07:00
jaynus
6d93fe45a6 Guidance handoff to guiding unit/laser shooter. This needs LOBL vs. LOAL capability. 2015-04-16 09:35:21 -07:00
ulteq
d82d9984d8 Added missing parentheses 2015-04-16 18:29:23 +02:00
jaynus
4c749a30cf ignore leading numbers search_privates 2015-04-16 09:22:11 -07:00
jaynus
b50c615e2c Updated for module-specific command line argument. 2015-04-16 09:00:22 -07:00
jaynus
fe7596d28d handles CBA PARAMS_ and EXPLODE_ 2015-04-16 08:46:11 -07:00
jaynus
184d7c8506 Tool addition. Search for missing private declarations by file. 2015-04-16 08:18:30 -07:00
KoffeinFlummi
8f94bbfec8 Make stringtableduplicates.py more useful 2015-04-15 13:55:07 +02:00
ViperMaul
db890f3b48 #576 - Obsolete PBO removal support added to build.py 2015-04-14 10:52:30 -07:00
ViperMaul
f422d1059a #572 - We now always build common.pbo to make sure we always display the accurate version number in the RPT. 2015-04-13 18:51:39 -07:00
ViperMaul
87acec03f4 Protect against CfgConvert errors from crashing make.py and properly restore config.cpp - fixes #557 2015-04-13 09:45:44 -07:00
ViperMaul
9e6d263806 Allowing automatic resume on error when one module fails to build. 2015-04-12 15:40:57 -07:00
bux578
eeb94b617f add x64 make.py
takes into account that mikero's tools are in Wow6432Node
2015-04-11 08:14:38 +02:00
KoffeinFlummi
b54d1e8786 Nicer output in build.py 2015-04-09 21:37:54 +02:00
KoffeinFlummi
3a871eed58 Merge branch 'master' into tools-cleanup 2015-04-09 13:37:19 +02:00
ViperMaul
92b672f713 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 20:40:09 -07:00
ViperMaul
ca1bafcc79 Improved usage of the registry for path to CfgConvert.exe and MikeRo Tools 2015-04-07 20:36:19 -07:00
PabstMirror
29d9da9f4d Include needed CBA file prerec
Dragging needs this to compile
2015-04-07 22:05:15 -05:00
KoffeinFlummi
490df5930e Add build number to release build 2015-04-08 00:13:58 +02:00
KoffeinFlummi
4d001642dc Merge remote-tracking branch 'origin/master' into tools-cleanup 2015-04-07 23:42:47 +02:00
KoffeinFlummi
7398c7a8ed Make build.bat a python script 2015-04-07 22:16:22 +02:00
KoffeinFlummi
b2de6a0013 Move syntax highlighting to extras/ 2015-04-07 21:39:49 +02:00
KoffeinFlummi
d0009cd38a Remove unneeded scripts 2015-04-07 21:39:22 +02:00
KoffeinFlummi
93b31af2d3 Properly indent stringtable scripts 2015-04-07 21:38:27 +02:00
KoffeinFlummi
6b73713585 Make Pabst's make.py the default 2015-04-07 21:38:03 +02:00
PabstMirror
c72dd39691 Build script: use cmd line cfgConvert 2015-04-07 13:53:40 -05:00
PabstMirror
18b51aa2b5 Build script: possibly fixed cfgConvert problems 2015-04-07 12:49:15 -05:00
ViperMaul
26fb06f774 Now using the Arma3 tools path taking from the registry for CfgConvert 2015-04-05 10:40:37 -07:00
KoffeinFlummi
443d0c5586 Add setup script and CBA includes 2015-04-04 16:33:53 +02:00
PabstMirror
a146be57f2 Modifyed build tool for pboProject problems
Should work on last release of mikero's tools
(because that version of rapify struggles with some CBA macros)
Runs config.cpp though cfgConvert twice to "demacro" config.cpp
Then restores backup when finished
2015-03-20 13:04:54 -05:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
jaynus
2ae2f5fc2f Remove pbo's for build.bat 2015-01-21 10:56:06 -08:00
KoffeinFlummi
d2c75087e8 Make all py scripts in /tools executable 2015-01-19 12:44:58 +01:00
bux578
eea6780e59 add more macros to np++ sh 2015-01-13 16:23:48 +01:00
bux578
a4a7318eae change np++ sh colors 2015-01-13 16:16:10 +01:00
bux578
46fe10658e notepad++ sh sqf cba
It's not really a tool ... i know
2015-01-13 15:56:02 +01:00
ViperMaul
252b9f6790 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-12 23:20:26 -08:00
jaynus
3fb2a8e245 big code clean up 2015-01-12 21:14:27 -08:00
ViperMaul
16a3e1d489 Build Script coded in Python. Requires mikero tools: pboProject and its requirements plus BIS Tools 2015-01-12 20:50:45 -08:00
KoffeinFlummi
bb194e6e93 Remove versionnumbers.py, move scripts to tools/ 2015-01-12 11:49:30 +01:00
jaynus
876fa59a32 gitignore updated. Development build.bat added. 2015-01-11 13:40:51 -08:00