mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-09 10:47:58 +02:00
IDE: fixed not passing -FE when it is the same as -FU, fixed passing -o when targetfilename is empty
git-svn-id: trunk@58059 -
This commit is contained in:
mattias
parent
2a7237fad1
commit
71b1d4d70a
@ -644,17 +644,27 @@ msgstr "JSON zeigen"
|
||||
msgid "Sort"
|
||||
msgstr "Sortieren"
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
msgstr "Gewählte Packages laden"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
#, fuzzy
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr "Installiert"
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr "Bewertung zurücksetzen"
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
msgstr "Gewählte Packages speichern"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
msgid "Save to file"
|
||||
@ -742,6 +752,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr "Bitte wählen Sie mindestens ein Package!"
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr "Analysiere JSON. Bitte warten..."
|
||||
|
||||
@ -687,17 +687,27 @@ msgstr "Mostrar JSON"
|
||||
msgid "Sort"
|
||||
msgstr "Ordenar"
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
msgstr "Cargar paquetes comprobados"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
#, fuzzy
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr "Instalado"
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr "Restablecer clasificación"
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
msgstr "Guardar paquetes comprobados"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
msgid "Save to file"
|
||||
@ -789,6 +799,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr "¡Por favor revise al menos un paquete!"
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr "Analizando JSON. Por favor espera..."
|
||||
|
||||
@ -663,16 +663,26 @@ msgstr "Näytä JSON"
|
||||
msgid "Sort"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
#, fuzzy
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr "Asenettu"
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
@ -753,6 +763,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr "JSON:in jäsennys. Odota ..."
|
||||
|
||||
@ -647,17 +647,27 @@ msgstr "Montrer le JSON"
|
||||
msgid "Sort"
|
||||
msgstr "Trier"
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
msgstr "Charger les paquets cochés"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
#, fuzzy
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr "Installé"
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr "Réinitialiser l'évaluation"
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
msgstr "Enregistrer les paquets cochés"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
msgid "Save to file"
|
||||
@ -739,6 +749,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr "Veuillez cocher au moins un paquet !"
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr "Parcours du fichier JSON. Veuillez patienter..."
|
||||
|
||||
@ -646,17 +646,27 @@ msgstr "JSON megjelenítése"
|
||||
msgid "Sort"
|
||||
msgstr "Rendezés"
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
msgstr "Kijelölt csomagok betöltése"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
#, fuzzy
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr "Telepítve"
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr "Értékelés visszavonása"
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
msgstr "Kijelölt csomagok mentése"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
msgid "Save to file"
|
||||
@ -746,6 +756,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr "Legalább egy csomagot ki kell jelölni!"
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr "JSON elemzése. Kis türelmet..."
|
||||
|
||||
@ -668,17 +668,27 @@ msgstr "Rodyti „JSON“"
|
||||
msgid "Sort"
|
||||
msgstr "Rikiuoti"
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
msgstr "Įkelti pažymėtus paketus"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
#, fuzzy
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr "Įdiegta"
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr "Nustatyti pradinį reitingą"
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
msgstr "Pažymėtus paketus įrašyti"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
msgid "Save to file"
|
||||
@ -768,6 +778,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr "Pažymėkite bent vieną paketo failą!"
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr "Nagrinėjamas „JSON“. Luktelėkite…"
|
||||
|
||||
@ -624,16 +624,25 @@ msgstr ""
|
||||
msgid "Sort"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
@ -712,6 +721,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr ""
|
||||
|
||||
@ -645,17 +645,27 @@ msgstr "Exibir JSON"
|
||||
msgid "Sort"
|
||||
msgstr "Classificar"
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
msgstr "Carregar pacotes marcados"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
#, fuzzy
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr "Instalado"
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr "Redefinir avaliação"
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
msgstr "Salvar pacotes marcados"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
msgid "Save to file"
|
||||
@ -745,6 +755,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr "Favor marcar ao menos um pacote!"
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr "Analisando JSON. Aguarde..."
|
||||
|
||||
@ -646,17 +646,27 @@ msgstr "Показать JSON"
|
||||
msgid "Sort"
|
||||
msgstr "Сортировать"
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
msgstr "Загрузить отмеченные пакеты"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
#, fuzzy
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr "Установлен"
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr "Сбросить рейтинг"
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
msgstr "Сохранить отмеченные пакеты"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
msgid "Save to file"
|
||||
@ -738,6 +748,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr "Следует отметить хотя бы один пакет!"
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr "Идёт чтение JSON. Подождите..."
|
||||
|
||||
@ -647,17 +647,27 @@ msgstr "Показати JSON"
|
||||
msgid "Sort"
|
||||
msgstr "Упорядкувати"
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadchecks
|
||||
msgid "Load checked packages"
|
||||
msgstr "Завантажити позначені пакунки"
|
||||
#: opkman_const.rsmainfrm_miload
|
||||
msgid "Load packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_miloadinstalled
|
||||
#, fuzzy
|
||||
msgctxt "opkman_const.rsmainfrm_miloadinstalled"
|
||||
msgid "Installed"
|
||||
msgstr "Встановлено"
|
||||
|
||||
#: opkman_const.rsmainfrm_miresetrating
|
||||
msgid "Reset rating"
|
||||
msgstr "Скинути рейтинг"
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecks
|
||||
msgid "Save checked packages"
|
||||
msgstr "Зберегти позначені пакунки"
|
||||
#: opkman_const.rsmainfrm_misave
|
||||
msgid "Save packages"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavechecked
|
||||
msgid "Checked"
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_misavetofile
|
||||
msgid "Save to file"
|
||||
@ -739,6 +749,10 @@ msgstr ""
|
||||
msgid "Please check at least one package!"
|
||||
msgstr "Слід позначити принаймні один пакунок!"
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessagenothinginstalled
|
||||
msgid "No packages are installed. Please install at least one package first."
|
||||
msgstr ""
|
||||
|
||||
#: opkman_const.rsmainfrm_rsmessageparsingjson
|
||||
msgid "Parsing JSON. Please wait..."
|
||||
msgstr "Читання JSON. Зачекайте..."
|
||||
|
||||
@ -3189,16 +3189,15 @@ begin
|
||||
{ Unit output directory }
|
||||
if (UnitOutputDirectory<>'') then begin
|
||||
CurOutputDir:=ParsedOpts.GetParsedValue(pcosOutputDir);
|
||||
if not (ccloAbsolutePaths in Flags) then
|
||||
CurOutputDir:=CreateRelativePath(CurOutputDir,BaseDirectory,true);
|
||||
end;
|
||||
end;
|
||||
|
||||
// append -o Option if neccessary
|
||||
{ * -o to define the target file name.
|
||||
* -FU if the unit output directory is not empty
|
||||
* -FE if the target file name is not in the project directory (where the lpi file is)
|
||||
}
|
||||
// output options -o, -FU, and -FE
|
||||
// * -o to define the target file name.
|
||||
// * -FU if the unit output directory is not empty
|
||||
// * -FE if the target file name is not in the project directory (where the lpi file is)
|
||||
// * if neither -FU nor -FE is passed fpc creates the ppu in the source directories
|
||||
|
||||
CurMainSrcFile:=GetDefaultMainSourceFileName;
|
||||
CurTargetFilename:='';
|
||||
CurTargetDirectory:='';
|
||||
@ -3226,19 +3225,25 @@ begin
|
||||
CurOutputDir:='';
|
||||
end;
|
||||
end;
|
||||
|
||||
if (not (ccloAbsolutePaths in Flags)) and FilenameIsAbsolute(CurTargetFilename) then
|
||||
CurTargetFilename := CreateRelativePath(CurTargetFilename, BaseDirectory);
|
||||
end;
|
||||
end;
|
||||
|
||||
if CurOutputDir<>'' then
|
||||
if CurOutputDir<>'' then begin
|
||||
if not (ccloAbsolutePaths in Flags) then
|
||||
CurOutputDir:=CreateRelativePath(CurOutputDir,BaseDirectory,true);
|
||||
switches := switches + ' '+PrepareCmdLineOption('-FU' + CurOutputDir);
|
||||
if CurTargetDirectory <> '' then
|
||||
end;
|
||||
if CurTargetDirectory <> '' then begin
|
||||
if not (ccloAbsolutePaths in Flags) then
|
||||
CurOutputDir:=CreateRelativePath(CurOutputDir,BaseDirectory,true);
|
||||
switches := switches + ' '+PrepareCmdLineOption('-FE' + CurTargetDirectory);
|
||||
if (CurTargetFilename<>'') and (TargetFilename<>'') then
|
||||
// custom target => pass -o
|
||||
switches := switches + ' '+PrepareCmdLineOption('-o' + CurTargetFilename);
|
||||
end;
|
||||
if (CurTargetFilename<>'') then begin
|
||||
if not (ccloAbsolutePaths in Flags) then
|
||||
CurTargetFilename := CreateRelativePath(CurTargetFilename, BaseDirectory);
|
||||
if CurTargetFilename<>'' then
|
||||
switches := switches + ' '+PrepareCmdLineOption('-o' + CurTargetFilename);
|
||||
end;
|
||||
|
||||
// append custom options as last, so they can override
|
||||
if not (ccloNoMacroParams in Flags) then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user