jonpas
2ac412a406
Merge branch 'master' into armake
2018-02-06 14:34:07 +01:00
John Harvey
13be39d0eb
Optionals moved into launchable mod folders ( #5038 )
...
* Optionals moved into launchable mod folders
when using make.py
* added '@' prefix
* Simplify publish.py
2017-12-31 13:12:42 -06:00
KoffeinFlummi
2e943ac744
Add windows support to Makefile and update armake binaries
2017-12-14 17:27:57 +01:00
jonpas
57da8c3ad0
Fix Mikero tools detection not looking at Wow6432Node
2017-12-12 12:40:33 +01:00
Daniel Jupp
5a4c439c22
Fix Mikero tools dupe key issue ( #5853 )
...
Mikero tools seams to not cleanup regkeys properly and leaves a key with no value behind making. Making find_depbo_tools break
2017-12-04 20:15:24 +01:00
Daniel Jupp
e507291bb6
Make.py Mikero tools detection fix ( #5774 )
...
* make.py mikero tools registry bug fix
* Fixed missed change
* Spaces after comma
2017-11-22 23:10:30 +01:00
PabstMirror
8fbb7378d4
Remove ace_server.pbo ( #5765 )
...
* Remove ace_server.pbo
* Cleanup make.py
2017-11-16 23:44:20 -06:00
ulteq
25344deb80
Ballistics - 7.62x54R muzzle velocity correction ( #5711 )
...
* Closes: https://github.com/acemod/ACE3/pull/5470
* Reference: https://github.com/acemod/ACE3/files/1272583/mousin.barrel.experiment.pdf
2017-10-31 10:58:12 +01:00
ulteq
8397e1cf4a
Tools - Fixed typo ( #5712 )
2017-10-30 11:16:21 -05:00
PabstMirror
cef4f9d923
make.py - Make no-bin work ( #5670 )
2017-10-24 15:52:04 -05:00
ulteq
61c044e16b
Fixed a typo in the airFriction generator script ( #5641 )
...
- Slightly improves the vanilla trajectory of the 'ACE_338_Ball' bullet
2017-10-20 17:33:40 +02:00
ulteq
5de48093da
Python tool which converts ballistic coefficients into 'airFriction' values. ( #5573 )
...
- This tool automatically calculates optimal 'airFriction' values for all ACE3 ammo types
2017-10-01 09:52:09 +02:00
PabstMirror
942ab122d3
Update configValidator tool for Mikero changes ( #5537 )
2017-09-21 12:41:48 -05:00
KoffeinFlummi
fa02d0d993
Merge tag 'v3.10.2' into armake
2017-09-19 02:13:24 +02:00
PabstMirror
accaf9fd01
Compatibility with newest mikro tools ( #5442 )
...
* Compatibility with newest mikro tools
- Remove all use of `access` in configs
- Add skeleton cfg for rtms
- Remove use of `-L` in makePbo for non-bin
* Tabs in model.cfg
2017-08-22 12:53:58 -05:00
jonpas
2d95bb1aad
Count untraced errors in make.py ( #5265 )
...
* Count untraced errors (any errors besides failed PBO builds and missinf files) in make.py
* Fix error count and prettify printing
2017-06-14 15:34:35 +02:00
PabstMirror
bfd3695868
SQF Lint Cleanup Pass ( #5157 )
...
* SQF Lint Cleanup Pass
* Fix var in TRACE
* Add basic python tool
* Simplify
* Hit space key 6 times
* Fix error in dropNozzle
* handle error message exceptions
* Fix py
2017-05-14 14:48:05 -05:00
PabstMirror
eb963f20f5
Update publish.py for RHS Gref Compat ( #4999 )
2017-03-18 08:53:56 -05:00
jonpas
b722c1dab1
Update armake Windows executables to 0.5.1
2017-02-07 04:13:11 +01:00
jonpas
601432daa7
Update Makefile, Place includes in include folder
2017-02-07 04:09:50 +01:00
jonpas
b2986cea8a
Merge branch 'master' into armake
2017-02-07 03:51:29 +01:00
PabstMirror
04d4353b5d
Fix reversed RHS compats - Close #4759 ( #4760 )
2016-12-20 15:37:51 -06:00
jonpas
a89bcd65d7
Remove build number from release archive
2016-11-24 11:07:29 +01:00
PabstMirror
e60df02758
Update CBA macros in tools ( #4620 )
2016-10-31 15:11:45 -05:00
jonpas
ffd1f0aff2
Update make.py to 0.8 ( #4579 )
...
* Update make.py to 0.8
* Remove redundant extras folder obsolete handling
* Fix version updating in files when version changes number of digits
* Satisfy bux
2016-10-25 20:11:05 +02:00
Glowbal
d5160b436f
Fix build tools not working with two digit build numbers
2016-10-18 22:15:49 +02:00
PabstMirror
1756ca2eeb
Add tool to upload ace and compats to workshop ( #4163 )
...
* Add tool to upload ace and compats to workshop
* Add ACE/RHS steamIDs, use changelog.txt
* Uncomment main ace publish
* Create individual RHS compat mods, add adr97
2016-10-07 17:05:53 -05:00
jonpas
fda10f0e7b
Add optionals support to extract dependencies tool, Add more checks if folders are present ( #4394 )
2016-09-17 11:40:50 +02:00
Glowbal
99c9e80d9f
Fix broken extract_dependencies script
2016-09-13 21:54:11 +02:00
Glowbal
65cdf200fb
Merged branch release into master
2016-09-13 21:28:22 +02:00
jonpas
65df821e2b
Add wiki ACEX sections and merge Mission Makers and Framework sections ( #4307 )
...
* Update documentation guidelines
* Add version info part 1
* Add version info part 2
* Add removed in version to frontmatter and tag testmissions as removed
* Add version info part 3
* Seaparate ACE3 and ACEX Features/Framework menus, Add ACEX Headless documentation
* Add ACEX support to extract_dependencies.py
* Merge useful-functions into frameworks
* Move class-names to main menu
* Prettify class-names table titles
* Fix table of contents on documentation guidelines and tips
* Merge mission-tools into frameworks
* Merge modules into frameworks
* Rename to Frameworks (plural)
* Fix capitalization in class-names
* Improve wiki menu positioning
* Add 'mod' to documentation guidelines
* Update frameworks sections description for new content
* Update wiki menu descriptions
* Fix class-names 4 digit versions
* More places for descriptions
* Include documentation in PRs if applicable note
* Add short ACE3 and ACEX description page, outlining the difference
2016-09-08 21:19:07 +02:00
Glowbal
3ba08cd6bb
Update CBA macro file
2016-09-05 08:22:42 +02:00
Glowbal
f908486468
Merge pull request #4270 from acemod/travisForDocs
...
Run documentation dependencies extractor on Travis deployment
2016-08-21 00:20:54 +02:00
jonpas
2182b2c742
Run documentation dependencies extractor on Travis deployment
2016-08-21 00:02:00 +02:00
jonpas
4d81a21e3f
Read git version from file as back up in make.py ( #4247 )
...
* Read git version from file rather than using Git client
* Use git files reading only as fallback
2016-08-20 11:52:18 +02:00
jonpas
d1d23c55bc
Streamline dependencies extraction tool ( #4268 )
...
* Streamline dependencies extraction tool for new wiki location, Update dependencies list
* Use LF strictly
2016-08-19 15:58:39 +02:00
jonpas
bd3f516e24
Revert pboProject tools removal
2016-07-11 16:20:32 +02:00
jonpas
b99b11d066
Merge branch 'master' into armake
2016-06-28 18:29:51 +02:00
PabstMirror
d5c3334719
Update CBA included in tools
2016-06-24 12:16:12 -05:00
KoffeinFlummi
9a12b74363
Update armake binaries
2016-06-16 23:41:40 +02:00
jonpas
3389720f6b
Merge branch 'master' into eol-lf
2016-06-10 00:12:07 +02:00
jonpas
1c06764d03
Add Extract Dependencies script ( #2640 )
...
* Add Extract Dependencies Python script, Add tools\temp to .gitignore
* Change backtick to single quote
* Remove unnecessary import
* Remove all whitespace
* Add support for multi-line dependencies, Add header comment, Improve
* Fix final message
* Update output to Jekyll IF statements for inclusion on pages
* Space
* Correct comments for Jekyll usage
2016-06-09 14:59:26 +02:00
jonpas
bd5f6107a0
Merge branch 'master' into eol-lf
2016-06-09 14:24:45 +02:00
jonpas
816da2aef1
Normalize to LF line endings
2016-05-30 18:37:03 +02:00
KoffeinFlummi
a730c25c88
Add batch file and clean up tools
2016-05-25 06:09:59 +02:00
SilentSpike
78cdd0d55a
Add event renaming script
2016-05-24 14:08:18 +01:00
jonpas
f956ea557a
Merge branch 'master' into armake
2016-05-22 17:41:43 +02:00
Glowbal
391191241b
Add apply to script validation
2016-05-21 13:46:26 +02:00
Glowbal
54caadfb88
Add support for new script command select in travis
2016-05-21 13:26:04 +02:00
jonpas
ee71ebe596
Readd CBA includes
2016-05-11 16:46:42 +02:00
jonpas
2b1681aed0
Add version and CBA include variable to Makefile, Remove CBA files
2016-05-09 16:44:03 +02:00
Glowbal
0c55d0ca06
Change start line number count sqf validation at 1
2016-05-03 15:15:55 +02:00
Glowbal
75cbe7df4f
Change start line count of config validation at 1
2016-05-03 15:15:10 +02:00
KoffeinFlummi
90f6b7c53b
Add PBOPREFIX files for CBA
2016-05-02 16:39:57 +02:00
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
