Make Extended Macros default on all branches.

kareltucek · Aug 21, 2021 · 8d1e0c7 · 8d1e0c7
1 parent d06b654
commit 8d1e0c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/right/src/macros.c b/right/src/macros.c
@@ -601,7 +601,6 @@ static bool dispatchText(const char* text, uint16_t textLen)
 
 static bool processTextAction(void)
 {
-#ifdef EXTENDED_MACROS
     if (s->ms.currentMacroAction.text.text[0] == '$') {
         bool actionInProgress = processCommandAction();
         s->as.currentConditionPassed = actionInProgress;
@@ -611,7 +610,6 @@ static bool processTextAction(void)
     } else if (s->ms.currentMacroAction.text.text[0] == '/' && s->ms.currentMacroAction.text.text[1] == '/') {
         return false;
     }
-#endif
 
     return dispatchText(s->ms.currentMacroAction.text.text, s->ms.currentMacroAction.text.textLen);
 }
@@ -2370,6 +2368,8 @@ static bool processCommand(const char* cmd, const char* cmdEnd)
     return false;
 }
 
+//TODO: removethis
+/*
 static bool processStockCommandAction(const char* cmd, const char* cmdEnd)
 {
     const char* cmdTokEnd = TokEnd(cmd, cmdEnd);
@@ -2416,6 +2416,7 @@ static bool processStockCommandAction(const char* cmd, const char* cmdEnd)
     }
     return false;
 }
+*/
 
 
 static bool processCommandAction(void)
@@ -2432,11 +2433,7 @@ static bool processCommandAction(void)
         return false;
     }
 
-#ifdef EXTENDED_MACROS
     return processCommand(cmd, cmdEnd);
-#else
-    return processStockCommandAction(cmd, cmdEnd);
-#endif
 }
 
 static bool processCurrentMacroAction(void)

diff --git a/scripts/Makedefs.mk b/scripts/Makedefs.mk
@@ -97,8 +97,7 @@ CFLAGS = -mthumb                    \
          -Wrestrict                 \
          -Wnull-dereference         \
          -Wshadow                   \
-         $(BUILD_FLAGS)             \
-         $(CUSTOM_CFLAGS)
+         $(BUILD_FLAGS)
 
 # Compiler options for C++ only.
 CXXFLAGS = -felide-constructors -fno-exceptions -fno-rtti

diff --git a/scripts/make-release.js b/scripts/make-release.js
@@ -12,14 +12,8 @@ const package = JSON.parse(fs.readFileSync(`${__dirname}/package.json`));
 const version = package.firmwareVersion;
 const releaseName = `uhk-firmware-${version}`;
 const releaseDir = `${__dirname}/${releaseName}`;
+const releaseFile = `${__dirname}/${releaseName}.tar.gz`;
 const agentDir = `${__dirname}/../lib/agent`;
-var releaseFile = `${__dirname}/${releaseName}.tar.gz`;
-var mkArgs = '';
-
-if( process.argv.includes('--extendedMacros')) {
-    mkArgs = mkArgs + 'CUSTOM_CFLAGS=-DEXTENDED_MACROS'
-    releaseFile = `${__dirname}/${releaseName}-extendedMacros.tar.gz`;
-}
 
 const deviceSourceFirmwares = package.devices.map(device => `${__dirname}/../${device.source}`);
 const moduleSourceFirmwares = package.modules.map(module => `${__dirname}/../${module.source}`);
@@ -32,7 +26,7 @@ const sourcePaths = [
 for (sourcePath of sourcePaths) {
     const buildDir = path.dirname(`${__dirname}/../${sourcePath}`);
     mkdir('-p', buildDir);
-    exec(`cd ${buildDir}/..; make clean; make -j8 ${mkArgs}`);
+    exec(`cd ${buildDir}/..; make clean; make -j8`);
 }
 
 exec(`npm ci; npm run build`, { cwd: agentDir });