Source tweaks required due to some build system reconfiguration

livecodefraser · livecodefraser · commit 6ca2976882c3 · 2015-03-31T15:02:51.000+01:00
diff --git a/engine/encode_version.rev b/engine/encode_version.rev
@@ -21,5 +21,5 @@ on generate
     replace ("$" & word 1 to -1 of it[1]) with (word 1 to -1 of it[2]) in tTemplate
   end repeat
 
-  put tTemplate into url ("binfile:" & $1 & "/include/revbuild.h")
+  put tTemplate into url ("binfile:" & $2 & "/include/revbuild.h")
 end generate
diff --git a/engine/hash_strings.rev b/engine/hash_strings.rev
@@ -1,5 +1,9 @@
 on startup
-   generate $1, $2, $3
+   try
+      generate $1, $2, $3
+   catch tError
+      write tError to stderr
+   end try
 end startup
 
 on generate pSource, pTarget, pPerfect
@@ -50,7 +54,7 @@ on generate pSource, pTarget, pPerfect
       put the keys of tTokens into url ("file:" & tTokensFile)
    end if
    
-   local tPerfectCmd
+   /*local tPerfectCmd
    set the itemDelimiter to ":"
    get item 2 to -1 of the address
    set the itemDelimiter to slash
@@ -70,9 +74,9 @@ on generate pSource, pTarget, pPerfect
       default
          put quote & pPerfect & quote into tPerfectCmd
       break
-   end switch
+   end switch*/
 
-   get shell(tPerfectCmd && "<" & quote & tTokensFile & quote)
+   get shell(pPerfect && "<" & quote & tTokensFile & quote)
    if char 1 of it is not "#" then
       delete line 1 of it
    end if
diff --git a/engine/src/globals.cpp b/engine/src/globals.cpp
@@ -76,7 +76,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #define HOLD_SIZE2 16384
 
 #ifdef TARGET_PLATFORM_MACOS_X
-#include <Foundation/NSAutoreleasePool.h>
+//#include <Foundation/NSAutoreleasePool.h>
 #endif
 
 #ifdef _ANDROID_MOBILE
diff --git a/engine/src/mcssl.cpp b/engine/src/mcssl.cpp
@@ -854,7 +854,7 @@ bool export_system_root_cert_stack(STACK_OF(X509) *&r_cert_stack)
 	t_success = NULL != (t_cert_stack = sk_X509_new(NULL));
 
 	if (t_success)
-		t_success = NULL != (t_cert_store = CertOpenSystemStore(NULL, L"ROOT"));
+		t_success = NULL != (t_cert_store = CertOpenSystemStoreW(NULL, L"ROOT"));
 
 	while (t_success && NULL != (t_cert_enum = CertEnumCertificatesInStore(t_cert_store, t_cert_enum)))
 	{
@@ -900,7 +900,7 @@ bool export_system_crl_stack(STACK_OF(X509_CRL) *&r_crls)
 	t_success = NULL != (t_crl_stack = sk_X509_CRL_new(NULL));
 
 	if (t_success)
-		t_success = NULL != (t_cert_store = CertOpenSystemStore(NULL, L"ROOT"));
+		t_success = NULL != (t_cert_store = CertOpenSystemStoreW(NULL, L"ROOT"));
 
 	while (t_success && NULL != (t_crl_enum = CertEnumCRLsInStore(t_cert_store, t_crl_enum)))
 	{
diff --git a/engine/src/mcutility.h b/engine/src/mcutility.h
@@ -21,6 +21,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include <string.h>
 #endif
 
+#include <ctype.h>
+
 ////////////////////////////////////////////////////////////////////////////////
 
 void *memdup(const void *p_src, unsigned int p_src_length);
diff --git a/revbrowser/src/cefbrowser_osx.mm b/revbrowser/src/cefbrowser_osx.mm
@@ -14,7 +14,7 @@
  You should have received a copy of the GNU General Public License
  along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
-#include "external.h"
+#include "revolution/external.h"
 #include "cefbrowser.h"
 
 #include "core.h"
diff --git a/revbrowser/src/cefbrowser_w32.cpp b/revbrowser/src/cefbrowser_w32.cpp
@@ -16,7 +16,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include "core.h"
 
-#include "external.h"
+#include <revolution/external.h>
 
 #include "cefbrowser.h"
 
diff --git a/revbrowser/src/osxbrowser.mm b/revbrowser/src/osxbrowser.mm
diff --git a/revbrowser/src/revbrowser.h b/revbrowser/src/revbrowser.h
@@ -17,6 +17,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef __REVBROWSER__
 #define __REVBROWSER__
 
+#include <core.h>
+
 class CWebBrowserBase
 {
 public:
diff --git a/revbrowser/tools/make_more_helpers.sh b/revbrowser/tools/make_more_helpers.sh
@@ -76,5 +76,5 @@ make_helper() {
   chmod a+r "${feature_info_plist}"
 }
 
-make_helper "${CONFIGURATION_BUILD_DIR}" "${PRODUCT_NAME}" "EH" "--executable-heap"
-make_helper "${CONFIGURATION_BUILD_DIR}" "${PRODUCT_NAME}" "NP" "--no-pie"
+make_helper "${1}" "${2}" "EH" "--executable-heap"
+make_helper "${1}" "${2}" "NP" "--no-pie"
diff --git a/revfont/src/revfont.cpp b/revfont/src/revfont.cpp
@@ -16,9 +16,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include <cstring>
 
-#ifdef _MACOSX
 #include <stdlib.h>
-#endif
 
 #include <revolution/external.h>
 #include <revolution/support.h>
diff --git a/revspeech/src/w32sapi5speech.cpp b/revspeech/src/w32sapi5speech.cpp
@@ -97,7 +97,7 @@ bool WindowsSAPI5Narrator::Initialize(void)
 	if(IsInited())
 		return true;
 
-	Error(TEXT(""));	
+	Error(L"");	
 	
 	//sapi init
 	HRESULT hr = S_OK;		
diff --git a/revspeech/src/w32sapi5speech.h b/revspeech/src/w32sapi5speech.h
@@ -63,8 +63,8 @@ class WindowsSAPI5Narrator: public INarrator
 	char m_strLastError[256];
 
 	// Internal Error Message
-	void Error( TCHAR* pText ){wcscpy((WCHAR *)m_strLastError, pText); };
-	void Error( TCHAR* pText, HRESULT hr){ sprintf(m_strLastError,"%s Error Code:0x%x", pText, hr); };
+	void Error( WCHAR* pText ){wcscpy((WCHAR *)m_strLastError, pText); };
+	void Error( WCHAR* pText, HRESULT hr){ sprintf(m_strLastError,"%s Error Code:0x%x", pText, hr); };
 
 	// Pointer to our tts voice	
 	CComPtr<ISpVoice> m_cpVoice;		
diff --git a/tools/list_stub_symbols.lc b/tools/list_stub_symbols.lc
@@ -2,8 +2,9 @@
 
 on startup
   local tSpec
-  read from stdin until eof
-  put it into tSpec
+  local tOutput
+
+  put url("file:" & $2) into tSpec
   
   local tPrefix
   if $1 is not empty then
@@ -41,6 +42,8 @@ on startup
       delete char -1 of tSymbol
     end if
 
-    write tPrefix & tSymbol & return to stdout
+    put tPrefix & tSymbol & return after tOutput
   end repeat
+  
+  put tOutput into url("file:" & $3)
 end startup
diff --git a/tools/weak_stub_maker.lc b/tools/weak_stub_maker.lc
@@ -3,19 +3,23 @@
 local sgModuleSymbols
 local sgModuleDetails
 
+local sOutput
+
 on startup
   try
     process
   catch tError
-    write tError & return to stdout
+    write tError & return to stderr
   end try
 end startup
 
 on process
   local tSpec
 
-  read from stdin until eof
-  put it into tSpec
+  put url("file:" & $1) into tSpec
+  
+  put $2 into sOutput
+  open file sOutput for write
 
   local tLine, tModule
   repeat for each line tLine in tSpec
@@ -315,6 +319,6 @@ function typelistToProto pList, pWithArgs
 end typelistToProto
 
 on output pLine
-  write pLine & return to stdout
+  write pLine & return to file sOutput
 end output
 

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@ bool export_system_root_cert_stack(STACK_OF(X509) *&r_cert_stack)`
`854`	`854`	`t_success = NULL != (t_cert_stack = sk_X509_new(NULL));`
`855`	`855`
`856`	`856`	`if (t_success)`
`857`		`- t_success = NULL != (t_cert_store = CertOpenSystemStore(NULL, L"ROOT"));`
	`857`	`+ t_success = NULL != (t_cert_store = CertOpenSystemStoreW(NULL, L"ROOT"));`
`858`	`858`
`859`	`859`	`while (t_success && NULL != (t_cert_enum = CertEnumCertificatesInStore(t_cert_store, t_cert_enum)))`
`860`	`860`	`{`
`@@ -900,7 +900,7 @@ bool export_system_crl_stack(STACK_OF(X509_CRL) *&r_crls)`
`900`	`900`	`t_success = NULL != (t_crl_stack = sk_X509_CRL_new(NULL));`
`901`	`901`
`902`	`902`	`if (t_success)`
`903`		`- t_success = NULL != (t_cert_store = CertOpenSystemStore(NULL, L"ROOT"));`
	`903`	`+ t_success = NULL != (t_cert_store = CertOpenSystemStoreW(NULL, L"ROOT"));`
`904`	`904`
`905`	`905`	`while (t_success && NULL != (t_crl_enum = CertEnumCRLsInStore(t_cert_store, t_crl_enum)))`
`906`	`906`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */`
`17`	`17`	`#ifndef __REVBROWSER__`
`18`	`18`	`#define __REVBROWSER__`
`19`	`19`
	`20`	`+#include <core.h>`
	`21`	`+`
`20`	`22`	`class CWebBrowserBase`
`21`	`23`	`{`
`22`	`24`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -76,5 +76,5 @@ make_helper() {`
`76`	`76`	`chmod a+r "${feature_info_plist}"`
`77`	`77`	`}`
`78`	`78`
`79`		`-make_helper "${CONFIGURATION_BUILD_DIR}" "${PRODUCT_NAME}" "EH" "--executable-heap"`
`80`		`-make_helper "${CONFIGURATION_BUILD_DIR}" "${PRODUCT_NAME}" "NP" "--no-pie"`
	`79`	`+make_helper "${1}" "${2}" "EH" "--executable-heap"`
	`80`	`+make_helper "${1}" "${2}" "NP" "--no-pie"`