Commit Graph

294 Commits

Author SHA1 Message Date
jonpas
8072c9db41 Merge pull request #3652 from acemod/setupAlwaysUseJunctions
Always use junctions for dev environment setup
2016-04-10 21:57:16 +00:00
Glowbal
f409ce8248 Add config style validation 2016-04-07 19:55:10 +02:00
jonpas
2a7e0b2a48 Remove redundant directory symlink directive 2016-04-03 13:23:20 +02:00
jonpas
a9fd7c4d6f Always use junctions for dev environment setup 2016-04-03 02:27:23 +02:00
Thomas Kooi
1b80f68033 Merge pull request #3136 from jonpas/updateMake
Fix make.py undefined variable and regex
2016-02-20 17:32:19 +01:00
bux
34691decdf add meta.cpp to make.py importantFiles array 2016-02-18 17:00:19 +01:00
commy2
5d9f622bf8 Merge pull request #3277 from acemod/updatetoolscba
update cba files under tools
2016-02-18 14:20:26 +01:00
bux578
067f88ff42 change make.py to accept --ci arg 2016-02-16 15:46:10 +01:00
bux578
8ec7063206 add proper exit code when build is failing 2016-02-16 13:44:43 +01:00
bux578
245a9d43d1 fix - args being recognized as modules 2016-02-16 13:26:47 +01:00
bux578
dacb5e1748 add --ci switch to make.py
to signal the end of the process to an automated build
2016-02-16 13:14:28 +01:00
commy2
d326b1b6f1 update cba files under tools 2016-02-06 17:31:41 +01:00
Thomas Kooi
692ead07f1 Merge pull request #2264 from jonpas/make_versionFiles_subFolder_support
Add subfolder support to importantFiles and versionFiles to make.py
2016-02-04 19:35:15 +01:00
PabstMirror
1affa0dd18 Cleanup multithreading, allow running from any dir 2016-01-14 17:42:35 -06:00
PabstMirror
abe936065e Python tool to validate configs (using MakePbo) 2016-01-10 14:46:45 -06:00
jonpas
d8853e327e Fix undefined variable when make.py exits before builds, Rename aceVersion variable to project_version, Update regex search from CBA 2016-01-10 03:16:46 +01:00
PabstMirror
71d4afcace Merge pull request #3127 from acemod/resetCacheOnNewVersion
Reset make.py Cache on new build version
2016-01-06 23:39:20 -06:00
Glowbal
e828076377 Add error on tab in sqf files to sqf validator 2015-12-21 17:06:04 +01:00
PabstMirror
dbdf434c1e Reset make.py Cache on new build version
Close #1127
If the version (from main) changes, reset cache
Same effect as "force"
2015-12-13 15:43:12 -06:00
Glowbal
94cf661e44 Add mention when make fails to build all pbos.
- Prints all failed modules when make has completed
- No longer prints green OK text if a single module fails
- Gives a count of how many modules have failed to build

This is done to prevent overlooking of a failed pbo in the build process, since there is a huge amount of modules being build.
2015-11-28 19:40:59 +01:00
PabstMirror
cf9235c926 make.py - update for new mikros tools 2015-11-19 00:28:28 -06:00
PabstMirror
716e82619b Merge pull request #2738 from acemod/pySearchLocalPrivates
Local privates to search_privates.py
2015-11-10 10:16:24 -06:00
PabstMirror
af5b646adb Update CBA Includes
From
354f1b189e
2015-11-04 13:15:45 -06:00
PabstMirror
a432687552 make.py - fix last input spacing
no blocking on import
2015-10-29 21:07:33 -05:00
PabstMirror
d091fcbdbc #2706 - Local privates to search_privates.py 2015-10-12 16:14:35 -05:00
Glowbal
3e4906fa7e Revert the backslash in sqf validator
- Use a forward slash in path for travis to work properly
2015-10-12 21:29:50 +02:00
jonpas
d926a4a52a Add shebang line to specify python version to SQF validator and replace slash with backslash 2015-10-11 23:20:56 +02:00
Glowbal
b524c28d53 Improved output text
- Capitalized SQF everywhere
- Break checked files and errors into multiple lines
- Add a break by line between reported errors and result
- Fix incorrect report message for semi-columns
- Change excessive usage of # prints on start
2015-10-11 18:31:39 +02:00
Glowbal
d6ab43d77e Possible fix for travis build failure 2015-10-11 17:35:55 +02:00
Glowbal
afb28d01ea Improve sqf validator
- fix not all string cases were caught
- add basic semi column validation after code blocks
- Improve print output
- Fix a dot in file path when reporting an error
2015-10-11 17:25:53 +02:00
Glowbal
8e9c2754fd Change translation guide link in translations issue to markdown
- Change from @Jonpas
2015-10-11 15:01:31 +02:00
jonpas
fc7230359f Remove redundant variables (left-over from deploy wiki to gh-pages) 2015-10-08 21:58:02 +02:00
jonpas
7258bc5efc Fix link in deploy tool 2015-10-08 17:55:54 +02:00
PabstMirror
dc9ba7aa4c Validate sqf - python 3 compat 2015-10-04 03:48:37 -05:00
Glowbal
f884f7d8fd Merge pull request #2552 from acemod/sqf-parser
Add a first implementation of the sqf validator/parser/linter.
2015-10-04 09:33:42 +02:00
Glowbal
93e5429ed5 Add sqf validator script to travis configuration 2015-09-22 20:18:12 +02:00
Glowbal
b695a54655 Add a first implementation of the sqf validator/parser/linter.
Checks all sqf files within given module or entire project for missing [] {} or ()
  Prints out information regarding anything it marks as a possible error
2015-09-21 18:01:45 +02:00
PabstMirror
80483f6dad fix ESTRING search 2015-09-20 17:56:07 -05:00
PabstMirror
5555eb195a Also search for missing stringtable entries 2015-09-20 17:46:43 -05:00
PabstMirror
6773119f09 Script to search for undefined functions 2015-09-18 13:14:00 -05:00
jonpas
6622afb9cd Updated location of foreign readmes per #2377 2015-09-09 18:57:34 +02:00
jonpas
daa4a868d2 Merge branch 'master' into make_versionFiles_subFolder_support 2015-09-09 18:56:38 +02:00
bux578
6da19a43df remove documentation from master 2015-09-07 19:50:38 +02:00
ViperMaul
0e432a5eb3 Merge pull request #2271 from jonpas/toolsCBAupdate
Updated required CBA files
2015-08-30 21:38:13 -07:00
jonpas
1187b73419 make.py version bump to 0.7 2015-08-27 03:23:56 +02:00
jonpas
f1e5ca24bf Updated required CBA files 2015-08-26 06:11:52 +02:00
jonpas
fe7a02a63d Updated make.py with changes from CBA 2015-08-25 20:59:55 +02:00
jonpas
e512a3675a Added subfolder support to importantFiles and versionFiles 2015-08-25 20:28:33 +02:00
ViperMaul
3a9d6a6a6c Added running time elapsed to make.py 2015-08-23 23:00:22 -07:00
PabstMirror
3664afcf90 search_privates.py: use new params command 2015-08-08 13:42:05 -05:00
jonpas
91dc9f5f18 Added version argument to run version update, default will stash and restore changes to keep git work dir clean 2015-06-21 21:58:19 +02:00
jonpas
da9b5dd917 Merge branch 'master' into automateRelease 2015-06-19 16:44:37 +02:00
ViperMaul
c0cdcbab62 fixing missing backup files for config.cpp and $pboprefix$ in $NOBIN$ situations
#1682
2015-06-18 17:43:12 -07:00
jonpas
4330caea9a Removed redundant check 2015-06-18 21:30:06 +02:00
jonpas
873f861dc8 Improved release command line argument handling, Revamped set_version_in_files to support both types of versions dynamically, Release archive using long version, old archive removal improved 2015-06-18 21:19:01 +02:00
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