Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quote VERSION in VERSION_CONFIG #1207

Closed
wants to merge 3 commits into from
Closed

Quote VERSION in VERSION_CONFIG #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84f9f57
Quote version in version config macro
jonpas Jun 20, 2019
a181b44
Fix BOM
jonpas Jun 20, 2019
6d0a010
Fix flexiMenu BOM
jonpas Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/main/script_macros_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#endif

#ifndef VERSION_CONFIG
#define VERSION_CONFIG version = VERSION; versionStr = QUOTE(VERSION); versionAr[] = {VERSION_AR}
#define VERSION_CONFIG version = QUOTE(VERSION); versionStr = QUOTE(VERSION); versionAr[] = {VERSION_AR}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If versionStr is QUOTE(VERSION), then why should version be QUOTE(VERSION) as well?

Isn't it more likely that version is supposed to be a number, which works as long as there is just one comma inside the version number? After this we convert stuff like 1.00 to "1.00", even though that versionStr was already "1.00".

I don't think the choice of tool should dictate this.

I know it is a shitty way of writing this, but this we inherited from CBA_A2.

Copy link
Member Author

@jonpas jonpas Aug 19, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even CBA doesn't have a version number like that, but one with 2 dot separators, which means Arma quotes it anyways (thus is wrong).

Tool is not dictating this, Arma and the macro use in CBA and most mods is. Any proper tool will give you a warning for missing quoting. I thought stuff from A2 CBA is supposed to be rewritten anyways. ;)

I don't have a solution to provide backwards compatibility, but CBA should be without inconsistencies/warnings like this.

#endif

#define ADDON DOUBLES(PREFIX,COMPONENT)
Expand Down
2 changes: 1 addition & 1 deletion addons/optics/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define COMPONENT optics
#define COMPONENT optics
#include "\x\cba\addons\main\script_mod.hpp"

//#define DEBUG_MODE_FULL
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_arma2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//#include "\x\cba\addons\ui\script_component.hpp"
//#include "\x\cba\addons\ui\script_component.hpp"

#define _DefaultAspectRatio 3 / 4
#define _SX (safeZoneX+safeZoneW / 2) // screen centre x
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_buttonList.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//#include "\x\cba\addons\ui\script_component.hpp"
//#include "\x\cba\addons\ui\script_component.hpp"

#define _imagePath(TOKEN) QUOTE(PATHTOF(flexiMenu)\data\buttonList\TOKEN.paa)
#define _SX (safeZoneX + safeZoneW / 2) // screen centre x
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_iconRow.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
 //#include "\x\cba\addons\ui\script_component.hpp"
//#include "\x\cba\addons\ui\script_component.hpp"

#define _imagePath(TOKEN) QUOTE(PATHTOF(flexiMenu)\data\arma2\TOKEN.paa)
#define _SX (safeZoneX + safeZoneW / 2) // screen centre x
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_popup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// #include "\x\cba\addons\ui\script_component.hpp"
// #include "\x\cba\addons\ui\script_component.hpp"

#define _imagePath(TOKEN) QUOTE(PATHTOF(flexiMenu)\data\popup\TOKEN.paa)
#define _SX (safeZoneX + safeZoneW / 2) //screen centre x
Expand Down