MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[merge-as-4.0] Fix project structure, licenses and so on to make sure that generated installer is valid

Browse Source 
GitOrigin-RevId: 54c122cb3c74e4338e761df6433edee9fd524676
This commit is contained in:
Andrei Kuznetsov
2020-06-14 16:27:34 +03:00
committed by intellij-monorepo-bot
parent c220daeb1f
commit 37d131acd7
14 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/aia_proto.xml
Generated
+3 -2
View File
@@ -1,7 +1,8 @@
<component name="libraryTable">
<library name="aia-proto">
<library name="aia-proto" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:proto:27.0.0.0" />
<CLASSES>
<root url="jar:///home/open/projects/studio-master-dev/bazel-bin/tools/base/sdk-common/aia-manifest-jar-generator/proto.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/proto/27.0.0.0/proto-27.0.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/freemarker.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="freemarker" type="repository">
<properties include-transitive-deps="false" maven-id="org.freemarker:freemarker:2.3.30" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/layoutinspector_proto.xml
Generated
+2 -2
View File
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="layoutinspector-proto" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:java_proto:26.6.0.3" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:layout_inspector_java_proto:27.0.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/java_proto/26.6.0.3/java_proto-26.6.0.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/layout_inspector_java_proto/27.0.0.0/layout_inspector_java_proto-27.0.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/live_sql_proto.xml
Generated
+3 -2
View File
@@ -1,7 +1,8 @@
<component name="libraryTable">
<library name="live-sql-proto">
<library name="live-sql-proto" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:live_sql_java_proto:27.0.0.0" />
<CLASSES>
<root url="jar:///home/open/projects/studio-master-dev/bazel-bin/tools/base/experimental/live-sql-inspector/live_sql_java_proto.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/live_sql_java_proto/27.0.0.0/live_sql_java_proto-27.0.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/org_jetbrains_intellij_deps_android_tools_base_templates.xml
Generated
+2 -2
View File
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="org.jetbrains.intellij.deps.android.tools.base:templates" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:templates:26.6.0.3" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:templates:27.0.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/templates/26.6.0.3/templates-26.6.0.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/templates/27.0.0.0/templates-27.0.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/perfetto_proto.xml
Generated
+2 -2
View File
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="perfetto-proto" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:perfetto-protos:26.6.0.3" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:perfetto-protos:27.0.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/perfetto-protos/26.6.0.3/perfetto-protos-26.6.0.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/perfetto-protos/27.0.0.0/perfetto-protos-27.0.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/studio_analytics_proto.xml
Generated
+3 -5
View File
@@ -1,12 +1,10 @@
<component name="libraryTable">
<library name="studio-analytics-proto" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:protos:26.6.0" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:libstudio.proto:27.0.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/protos/26.6.0/protos-26.6.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/libstudio.proto/27.0.0.0/libstudio.proto-27.0.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/protos/26.6.0/protos-26.6.0-sources.jar!/" />
</SOURCES>
<SOURCES />
</library>
</component>
.idea/libraries/studio_grpc.xml
Generated
+2 -2
View File
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="studio-grpc" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:studio-grpc:26.6.0.3" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:studio-grpc:27.0.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/studio-grpc/26.6.0.3/studio-grpc-26.6.0.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/studio-grpc/27.0.0.0/studio-grpc-27.0.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/studio_proto.xml
Generated
+2 -2
View File
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="studio-proto" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:studio-proto:26.6.0.3" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:studio-proto:27.0.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/studio-proto/26.6.0.3/studio-proto-26.6.0.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/studio-proto/27.0.0.0/studio-proto-27.0.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/transport_proto.xml
Generated
+2 -2
View File
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="transport-proto" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:transport_java_proto:26.6.0.3" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools.base:transport_java_proto:27.0.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/transport_java_proto/26.6.0.3/transport_java_proto-26.6.0.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/base/transport_java_proto/27.0.0.0/transport_java_proto-27.0.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/modules.xml
Generated
+1
View File
@@ -600,6 +600,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/laf/macos/intellij.laf.macos.iml" filepath="$PROJECT_DIR$/plugins/laf/macos/intellij.laf.macos.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" filepath="$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" />
<module fileurl="file://$PROJECT_DIR$/android/lint/intellij.lint.iml" filepath="$PROJECT_DIR$/android/lint/intellij.lint.iml" />
<module fileurl="file://$PROJECT_DIR$/android/lint/tests/intellij.lint.tests.iml" filepath="$PROJECT_DIR$/android/lint/tests/intellij.lint.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/markdown/intellij.markdown.iml" filepath="$PROJECT_DIR$/plugins/markdown/intellij.markdown.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/maven/intellij.maven.iml" filepath="$PROJECT_DIR$/plugins/maven/intellij.maven.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver/common/intellij.maven.artifactResolver.common.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver/common/intellij.maven.artifactResolver.common.iml" />
build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
+1 -1
View File
@@ -101,7 +101,7 @@ abstract class BaseIdeaProperties extends JetBrainsProductProperties {
"plugins/xpath/lib/rt/xslt-rt.jar" : "1.6",
"plugins/xslt-debugger/lib/xslt-debugger-rt.jar" : "1.6",
"plugins/xslt-debugger/lib/rt/xslt-debugger-impl-rt.jar" : "1.8",
"plugins/android/lib/layoutlib-jre11-26.6.0.3.jar" : "9",
"plugins/android/lib/layoutlib-jre11-27.0.0.0.jar" : "9",
"plugins/android/lib/android-rt.jar" : "1.8",
]
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+19 -5
View File
@@ -14,6 +14,7 @@ class CommunityLibraryLicenses {
public static final List<LibraryLicense> LICENSES_LIST = [
new LibraryLicense(name: "AAPT Protos", libraryName: "aapt-proto", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Amazon Ion Java", libraryName: "ion", license: "Apache 2.0", url: "https://github.com/amzn/ion-java"),
new LibraryLicense(name: "Android AIA Protos", libraryName: "aia-proto", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Analytics", attachedTo: "intellij.android.core", license: "Apache 2.0",
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Analytics Crash", libraryName: "precompiled-analytics-crash",
@@ -30,6 +31,12 @@ class CommunityLibraryLicenses {
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Apk Binary Resources", libraryName: "precompiled-binary-resources", license: "Apache 2.0",
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Archive Patcher (explainer)", libraryName: "explainer-27.0.0.0.jar", license: "Apache 2.0",
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Archive Patcher (generator)", libraryName: "generator-27.0.0.0.jar", license: "Apache 2.0",
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Archive Patcher (shared)", libraryName: "shared-27.0.0.0.jar", license: "Apache 2.0",
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Baksmali", libraryName: "baksmali", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Builder", attachedTo: "intellij.android.core", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Builder Model", libraryName: "precompiled-builder-model", license: "Apache 2.0",
@@ -38,6 +45,8 @@ class CommunityLibraryLicenses {
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Chunkio", libraryName: "precompiled-chunkio", license: "Apache 2.0",
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Chunkio Processor", libraryName: "precompiled-chunkio-processor", license: "Apache 2.0",
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Common Library", libraryName: "precompiled-common", license: "Apache 2.0",
url: "http://source.android.com/"),
new LibraryLicense(name: "Android Data Binding Base Library", libraryName: "precompiled-db-baseLibrary", license: "Apache 2.0",
@@ -78,6 +87,8 @@ class CommunityLibraryLicenses {
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android ninepatch Library", libraryName: "precompiled-ninepatch",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Perf-Logger Library", libraryName: "precompiled-perf-logger",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Perflib Library", libraryName: "precompiled-perflib",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Pixelprobe Library", libraryName: "precompiled-pixelprobe",
@@ -98,9 +109,11 @@ class CommunityLibraryLicenses {
url: "http://source.android.com/"),
new LibraryLicense(name: "Android USB Devices", libraryName: "precompiled-usb-devices",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Wizard Template", libraryName: "precompiled-intellij.android.wizardTemplate.impl",
new LibraryLicense(name: "Android Wizard Template", libraryName: "precompiled-wizardTemplate.impl",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Wizard Template Plugin", libraryName: "precompiled-intellij.android.wizardTemplate.plugin",
new LibraryLicense(name: "Android Wizard Template Plugin", libraryName: "precompiled-wizardTemplate.plugin",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Zipflinger", libraryName: "precompiled-zipflinger",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "ANTLR 4 Runtime", libraryName: "antlr4-runtime", license: "BSD",
url: "http://www.antlr.org", licenseUrl: "http://www.antlr.org/license.html"),
@@ -288,9 +301,9 @@ class CommunityLibraryLicenses {
licenseUrl: "https://github.com/unitsofmeasurement/indriya/blob/master/LICENSE"),
new LibraryLicense(name: "ini4j (JetBrains's fork)", libraryName: "ini4j", license: "Apache 2.0",
url: "https://github.com/JetBrains/intellij-deps-ini4j"),
new LibraryLicense(name: "Instant run protos", libraryName: "deploy-java-proto",
new LibraryLicense(name: "Instant run protos", libraryName: "deploy_java_proto",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Instant run version", libraryName: "deploy-java-version",
new LibraryLicense(name: "Instant run version", libraryName: "libjava_version",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "ISO RELAX", libraryName: "isorelax", license: "MIT License",
url: "http://sourceforge.net/projects/iso-relax/",
@@ -428,6 +441,7 @@ class CommunityLibraryLicenses {
url: "https://github.com/ktorio/ktor"),
new LibraryLicense(name: "kXML2", libraryName: "kxml2", license: "BSD", url: "http://sourceforge.net/projects/kxml/"),
new LibraryLicense(name: "Layout Inspector Protos", libraryName: "layoutinspector-proto", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Live SQL Protos", libraryName: "live-sql-proto", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Log4j", libraryName: "Log4J", license: "Apache 2.0",
url: "http://logging.apache.org/log4j/1.2/index.html", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
new LibraryLicense(name: "lz4-java", libraryName: "lz4-java", license: "Apache 2.0",
@@ -525,7 +539,7 @@ class CommunityLibraryLicenses {
url: "http://pycodestyle.readthedocs.io/"),
new LibraryLicense(name: "qdox-java-parser", libraryName: "qdox-java-parser", license: "Apache 2.0",
url: "https://github.com/paul-hammant/qdox", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
new LibraryLicense(name: "R8 DEX shrinker", libraryName: "r8-master", license: "BSD"),
new LibraryLicense(name: "R8 DEX shrinker", libraryName: "r8", license: "BSD"),
new LibraryLicense(name: "Relax NG Object Model", libraryName: "rngom-20051226-patched.jar", license: "MIT",
url: "https://github.com/kohsuke/rngom", licenseUrl: "http://www.opensource.org/licenses/mit-license.php"),
new LibraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino", license: "MPL 1.1",
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+4 -2
View File
@@ -288,8 +288,8 @@ class CommunityRepositoryModules {
withModule("intellij.android.sdkUpdates", "android.jar")
withModule("intellij.android.wizard", "android.jar")
withModule("intellij.android.wizard.model", "android.jar")
withModuleLibrary("precompiled-plugin", "android.sdktools.wizardTemplate.plugin", "")
withModuleLibrary("precompiled-impl", "android.sdktools.wizardTemplate.impl", "")
withModuleLibrary("precompiled-wizardTemplate.plugin", "android.sdktools.wizardTemplate.plugin", "")
withModuleLibrary("precompiled-wizardTemplate.impl", "android.sdktools.wizardTemplate.impl", "")
withModule("intellij.android.profilersAndroid", "android.jar")
withModule("intellij.android.deploy", "android.jar")
withModule("intellij.android.kotlin.idea", "android-kotlin.jar")
@@ -357,6 +357,8 @@ class CommunityRepositoryModules {
withModule("intellij.android.jps", "jps/android-jps-plugin.jar", null)
withProjectLibrary("kxml2") //todo[nik] move to module libraries
withProjectLibrary("asm-tools")
withResourceFromModule("intellij.android.core", "lib/commons-compress-1.8.1.jar", "lib")
withResourceFromModule("intellij.android.core", "lib/javawriter-2.2.1.jar", "lib")