Browse Source

Revert "Projucer: Check if IDE project file exists when saving"

This reverts commit a71bda9adb.
v6.1.6
reuk 3 years ago
parent
commit
6d711a2312
6 changed files with 11 additions and 34 deletions
  1. +1
    -4
      extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp
  2. +7
    -10
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
  3. +1
    -6
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CLion.h
  4. +1
    -6
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h
  5. +1
    -6
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
  6. +0
    -2
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h

+ 1
- 4
extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp View File

@@ -504,9 +504,6 @@ void ProjectContentComponent::openInSelectedIDE (bool saveFirst)
if (auto selectedExporter = headerComponent.getSelectedExporter())
{
if (! selectedExporter->canLaunchProject())
return;
if (saveFirst)
{
if (project->isTemporaryProject())
@@ -515,7 +512,7 @@ void ProjectContentComponent::openInSelectedIDE (bool saveFirst)
return;
}
if (project->hasChangedSinceSaved() || ! selectedExporter->getIDEProjectFile().exists())
if (project->hasChangedSinceSaved())
{
project->saveAsync (true, true, [safeThis = SafePointer<ProjectContentComponent> { this }] (Project::SaveResult r)
{


+ 7
- 10
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h View File

@@ -141,7 +141,7 @@ public:
gradleVersion (settings, Ids::gradleVersion, getUndoManager(), "7.0.2"),
gradleToolchain (settings, Ids::gradleToolchain, getUndoManager(), "clang"),
androidPluginVersion (settings, Ids::androidPluginVersion, getUndoManager(), "7.0.0"),
androidExecutable (getAppSettings().getStoredPath (Ids::androidStudioExePath, TargetOS::getThisOS()).get().toString())
AndroidExecutable (getAppSettings().getStoredPath (Ids::androidStudioExePath, TargetOS::getThisOS()).get().toString())
{
name = getDisplayName();
targetLocationValue.setDefault (getDefaultBuildsRootFolder() + getTargetFolderName());
@@ -165,25 +165,22 @@ public:
//==============================================================================
bool canLaunchProject() override
{
return androidExecutable.exists();
return AndroidExecutable.exists();
}
bool launchProject() override
{
if (! androidExecutable.exists())
if (! AndroidExecutable.exists())
{
jassertfalse;
return false;
}
auto targetFolder = getTargetFolder();
// we have to surround the path with extra quotes, otherwise Android Studio
// will choke if there are any space characters in the path.
return androidExecutable.startAsProcess (getIDEProjectFile().getFullPathName().quoted());
}
File getIDEProjectFile() const override
{
return getTargetFolder();
return AndroidExecutable.startAsProcess ("\"" + targetFolder.getFullPathName() + "\"");
}
//==============================================================================
@@ -1877,7 +1874,7 @@ private:
}
//==============================================================================
const File androidExecutable;
const File AndroidExecutable;
JUCE_DECLARE_NON_COPYABLE (AndroidProjectExporter)
};

+ 1
- 6
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CLion.h View File

@@ -126,12 +126,7 @@ public:
bool launchProject() override
{
return getCLionExecutableOrApp().startAsProcess (getIDEProjectFile().getFullPathName().quoted());
}
File getIDEProjectFile() const override
{
return getTargetFolder();
return getCLionExecutableOrApp().startAsProcess (getTargetFolder().getFullPathName().quoted());
}
String getDescription() override


+ 1
- 6
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h View File

@@ -1476,7 +1476,7 @@ public:
bool launchProject() override
{
#if JUCE_WINDOWS
return getIDEProjectFile().startAsProcess();
return getSLNFile().startAsProcess();
#else
return false;
#endif
@@ -1491,11 +1491,6 @@ public:
#endif
}
File getIDEProjectFile() const override
{
return getSLNFile();
}
void createExporterProperties (PropertyListBuilder& props) override
{
props.add (new TextPropertyComponent (manifestFileValue, "Manifest file", 8192, false),


+ 1
- 6
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h View File

@@ -660,7 +660,7 @@ public:
bool launchProject() override
{
#if JUCE_MAC
return getIDEProjectFile().startAsProcess();
return getProjectBundle().startAsProcess();
#else
return false;
#endif
@@ -675,11 +675,6 @@ public:
#endif
}
File getIDEProjectFile() const override
{
return getProjectBundle();
}
//==============================================================================
void create (const OwnedArray<LibraryModule>&) const override
{


+ 0
- 2
extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h View File

@@ -89,8 +89,6 @@ public:
virtual bool isOSX() const = 0;
virtual bool isiOS() const = 0;
virtual File getIDEProjectFile() const { return {}; }
virtual String getNewLineString() const = 0;
virtual String getDescription() { return {}; }


Loading…
Cancel
Save