The 01 November 2012 build (8497) is out.

User forums > Nightly builds

<< < (6/7) > >>

oBFusCATed:
No merging until the release! ::)

MortenMacFly:

--- Quote from: oBFusCATed on November 08, 2012, 08:11:23 am ---No merging until the release! ::)

--- End quote ---
Yes, I think we made that point already.

MortenMacFly:

--- Quote from: dmoore on November 08, 2012, 04:23:35 am ---A final thought on the "commands only" target: Does it make any sense for that target to have any of the build option tabs other than the pre/post build steps?

--- End quote ---
Macros (envvars) as well I'd say ()if you want to use them in scripts).

--- Quote from: Alpha on November 08, 2012, 02:28:54 am ---So creating a dummy "Null Compiler" should suit your purposes?

--- End quote ---
Yes - sounds reasonable for these purposes. BTW: all compiler related change sin the branch, please. I'll merge all the latest changes from trunk into the branch in a minute...

For the release we had in mind the following:
- Don't mess with the compiler in trunk until release
- Release
- Merge compiler branch into trunk
- All up-coming nightlies will then use the new compiler framework.

So whatever work needs to be done on the compiler front: If these are no critical bugs to fix, please do it in the branch...

rickg22:

--- Quote from: Alpha on November 08, 2012, 02:28:54 am ---

--- Quote from: rickg22 on November 05, 2012, 11:01:22 pm ---I'm always forced to "choose" a compiler - and I always end up choosing GCC by default, which obviously I don't have on this machine. I want to be able to choose "No compiler" or something, so that it won't ask me for compiler settings.

--- End quote ---
So creating a dummy "Null Compiler" should suit your purposes?

--- End quote ---

Yes! That's exactly what I had in mind, thanks! Just name it "No compiler" in the dialog :)

Alpha:
Here is a preliminary patch (against the XML Compiler branch); it covers (at least, should cover) the basics, but I am not sure what other tuning might benefit this.

--- Code: ---Index: src/plugins/compilergcc/compileroptionsdlg.cpp
===================================================================
--- src/plugins/compilergcc/compileroptionsdlg.cpp (revision 8543)
+++ src/plugins/compilergcc/compileroptionsdlg.cpp (working copy)
@@ -2778,7 +2778,8 @@
   {
   dlg.SetSize(dlg.GetPosition().x, dlg.GetPosition().y - (220 - dlg.GetSize().GetHeight()) / 2,
   dlg.GetSize().GetWidth(), 220);
- } dlg.ShowModal();
+ }
+ dlg.ShowModal();
   wxString flags = dlg.GetValue();
   flags.Replace(wxT("\n"), wxT(" "));
   flags.Replace(wxT("\r"), wxT(" "));
Index: src/plugins/compilergcc/compilergcc.cpp
===================================================================
--- src/plugins/compilergcc/compilergcc.cpp (revision 8543)
+++ src/plugins/compilergcc/compilergcc.cpp (working copy)
@@ -701,6 +701,12 @@

   // Get configured masterpath, expand macros and remove trailing separators
   wxString masterPath = compiler->GetMasterPath();
+ bool isNoComp = false;
+ if (masterPath == wxT("-- No Compiler --")) // Special case so "No Compiler" is valid
+ {
+ isNoComp = true;
+ masterPath.Clear();
+ }
   Manager::Get()->GetMacrosManager()->ReplaceMacros(masterPath);
   while ( !masterPath.IsEmpty()
   && ((masterPath.Last() == '\\') || (masterPath.Last() == '/')) )
@@ -757,7 +763,7 @@
   /* TODO (jens#1#): Is the above correct ?
   Or should we search in the whole systempath (pathList in this case) for the executable? */
   // Try again...
- if (binPath.IsEmpty() || (pathList.Index(binPath, caseSens)==wxNOT_FOUND))
+ if ((binPath.IsEmpty() || (pathList.Index(binPath, caseSens)==wxNOT_FOUND)) && !isNoComp)
   {
   InfoWindow::Display(_("Environment error"),
   _("Can't find compiler executable in your configured search path's for ") + compiler->GetName() + _T('\n'));
Index: src/plugins/compilergcc/resources/compilers/options_null.xml
===================================================================
--- src/plugins/compilergcc/resources/compilers/options_null.xml (revision 0)
+++ src/plugins/compilergcc/resources/compilers/options_null.xml (revision 0)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE CodeBlocks_compiler_options>
+<CodeBlocks_compiler_options>
+ 
+ <Option name="No active compiler"
+ option="none"
+ checkAgainst="none"
+ checkMessage="This is not a switch; it does nothing."
+ supersedes="none"/>
+</CodeBlocks_compiler_options>
Index: src/plugins/compilergcc/resources/compilers/compiler_null.xml
===================================================================
--- src/plugins/compilergcc/resources/compilers/compiler_null.xml (revision 0)
+++ src/plugins/compilergcc/resources/compilers/compiler_null.xml (revision 0)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE CodeBlocks_compiler>
+<CodeBlocks_compiler name="*No Compiler*"
+ id="null"
+ weight="100">
+ <Path type="master">
+ <Fallback path="-- No Compiler --"/>
+ </Path>
+</CodeBlocks_compiler>
Index: src/plugins/compilergcc/compilerXML.cpp
===================================================================
--- src/plugins/compilergcc/compilerXML.cpp (revision 8543)
+++ src/plugins/compilergcc/compilerXML.cpp (working copy)
@@ -244,8 +244,9 @@
   }
   wxSetEnv(wxT("PATH"), origPath);

- if (wxFileExists(m_MasterPath + wxFILE_SEP_PATH + wxT("bin") + wxFILE_SEP_PATH + m_Programs.C) ||
- wxFileExists(m_MasterPath + wxFILE_SEP_PATH + m_Programs.C))
+ if ( wxFileExists(m_MasterPath + wxFILE_SEP_PATH + wxT("bin") + wxFILE_SEP_PATH + m_Programs.C)
+ || wxFileExists(m_MasterPath + wxFILE_SEP_PATH + m_Programs.C)
+ || m_MasterPath == wxT("-- No Compiler --")) // Special case so "No Compiler" is valid
   {
   return adrDetected;
   }

--- End code ---

Navigation

[0] Message Index

[#] Next page

[*] Previous page

Go to full version