Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
8231283: Add support to jpackage to create install Linux packages in …
…/usr hierarchy Reviewed-by: herrick, almatvee
- Loading branch information
Alexey Semenyuk
committed
Jun 10, 2020
1 parent
714b345
commit 268d87018708347b1adc864f4048900c09feab4c
Showing
26 changed files
with
874 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include "Executor.h" | ||
| #include "Log.h" | ||
| #include "ErrorHandling.h" | ||
|
|
||
|
|
||
| int executeCommandLineAndReadStdout(const std::string& cmd, | ||
| CommandOutputConsumer& consumer) { | ||
| FILE * stream = popen(cmd.c_str(), "r"); | ||
| if (!stream) { | ||
| JP_THROW(tstrings::any() << "popen(" << cmd | ||
| << ") failed. Error: " << lastCRTError()); | ||
| } | ||
|
|
||
| LOG_TRACE(tstrings::any() << "Reading output of [" << cmd << "] command"); | ||
|
|
||
| try { | ||
| bool useConsumer = true; | ||
| std::string buf; | ||
| for (;;) { | ||
| const int c = fgetc(stream); | ||
| if(c == EOF) { | ||
| if (useConsumer && !buf.empty()) { | ||
| LOG_TRACE(tstrings::any() << "Next line: [" << buf << "]"); | ||
| consumer.accept(buf); | ||
| } | ||
| break; | ||
| } | ||
|
|
||
| if (c == '\n' && useConsumer) { | ||
| LOG_TRACE(tstrings::any() << "Next line: [" << buf << "]"); | ||
| useConsumer = !consumer.accept(buf); | ||
| buf.clear(); | ||
| } else { | ||
| buf.push_back(static_cast<char>(c)); | ||
| } | ||
| } | ||
| return pclose(stream); | ||
| } catch (...) { | ||
| if (stream) { | ||
| pclose(stream); | ||
| } | ||
| throw; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| #ifndef EXECUTOR_H | ||
| #define EXECUTOR_H | ||
|
|
||
| #include "tstrings.h" | ||
|
|
||
|
|
||
| class CommandOutputConsumer { | ||
| public: | ||
| virtual ~CommandOutputConsumer() {} | ||
|
|
||
| virtual bool accept(const std::string& line) { | ||
| return true; | ||
| }; | ||
| }; | ||
|
|
||
| int executeCommandLineAndReadStdout(const std::string& cmd, | ||
| CommandOutputConsumer& consumer); | ||
|
|
||
| #endif // #ifndef EXECUTOR_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.