diff --git a/.gitignore b/.gitignore index 33bbbd1..196589c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,6 @@ SCViewer initiator_target.launch SCViewer.xcf SCViewer_1.png -*.launch copyrightLog.txt /workspace +?*.launch \ No newline at end of file diff --git a/.launch/Build SCViewer.launch b/.launch/Build SCViewer.launch new file mode 100644 index 0000000..267d93e --- /dev/null +++ b/.launch/Build SCViewer.launch @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/.launch/Build and deploy SCViewer.launch b/.launch/Build and deploy SCViewer.launch new file mode 100644 index 0000000..e514693 --- /dev/null +++ b/.launch/Build and deploy SCViewer.launch @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/.launch/Set SCViewer version.launch b/.launch/Set SCViewer version.launch new file mode 100644 index 0000000..cf907bd --- /dev/null +++ b/.launch/Set SCViewer version.launch @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project index 88bcd68..a68889f 100644 --- a/.project +++ b/.project @@ -14,60 +14,4 @@ org.eclipse.m2e.core.maven2Nature - - - 0 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-features - - - - 0 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-plugins - - - - 0 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-com.minres.* - - - - 0 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-product - - - - 0 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-tests - - - - 0 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-p2repositories - - - diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target index 3de7c9e..146343c 100644 --- a/com.minres.scviewer.target/com.minres.scviewer.target.target +++ b/com.minres.scviewer.target/com.minres.scviewer.target.target @@ -31,6 +31,11 @@ + + + + + diff --git a/com.minres.scviewer.target/pom.xml b/com.minres.scviewer.target/pom.xml index d28de3c..ba93f17 100644 --- a/com.minres.scviewer.target/pom.xml +++ b/com.minres.scviewer.target/pom.xml @@ -12,7 +12,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.0.0-SNAPSHOT + 2.11.0 .. diff --git a/features/com.minres.scviewer.database.feature/build.properties b/features/com.minres.scviewer.database.feature/build.properties index b3a611b..3a8958f 100644 --- a/features/com.minres.scviewer.database.feature/build.properties +++ b/features/com.minres.scviewer.database.feature/build.properties @@ -1,2 +1,4 @@ bin.includes = feature.xml,\ feature.properties +src.includes = feature.properties,\ + feature.xml diff --git a/features/com.minres.scviewer.database.feature/feature.properties b/features/com.minres.scviewer.database.feature/feature.properties index 767ee18..1a8f646 100644 --- a/features/com.minres.scviewer.database.feature/feature.properties +++ b/features/com.minres.scviewer.database.feature/feature.properties @@ -1,6 +1,6 @@ -featureName=SystemC simulation results viewer +featureName=SystemC simulation results viewer database loaders providerName=MINRES Technologies GmbH -updateSiteName=SC Viewer Database Updates +updateSiteName=SC Viewer Database Loader Updates description=A viewer for SystemC Verification Library transactions and VCD signals. licenseURL=license.html license=\ diff --git a/features/com.minres.scviewer.database.feature/feature.xml b/features/com.minres.scviewer.database.feature/feature.xml index f9100b4..0220ea3 100644 --- a/features/com.minres.scviewer.database.feature/feature.xml +++ b/features/com.minres.scviewer.database.feature/feature.xml @@ -2,17 +2,15 @@ - A viewer for SystemC Verification Library transactions and VCD -signals. It supports a SQLite based recording as well as the built-in -text base recording. + The database loaders for SystemC Verification Library transactions and VCD signals. They support SQLite based recording as well as the built-in text base recording. - Copyright (c) 2015 MINRES Technologies GmbH. + Copyright (c) 2015-2021 MINRES Technologies GmbH. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -58,12 +56,6 @@ http://www.eclipse.org/legal/epl-v10.html version="0.0.0" unpack="false"/> - - com.minres.scviewer com.minres.scviewer.parent - 2.0.0-SNAPSHOT + 2.11.0 ../.. - 1.0.0-SNAPSHOT + 3.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.e4.feature/feature.xml b/features/com.minres.scviewer.e4.feature/feature.xml index cb817da..1177cb4 100644 --- a/features/com.minres.scviewer.e4.feature/feature.xml +++ b/features/com.minres.scviewer.e4.feature/feature.xml @@ -2,7 +2,7 @@ @@ -21,14 +21,6 @@ - - - - @@ -40,13 +32,10 @@ - - - @@ -55,10 +44,10 @@ - - + + com.minres.scviewer com.minres.scviewer.parent - 2.0.0-SNAPSHOT + 2.11.0 ../.. - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/features/com.minres.scviewer.e4.platform.feature/feature.xml b/features/com.minres.scviewer.e4.platform.feature/feature.xml index af86167..574cc69 100644 --- a/features/com.minres.scviewer.e4.platform.feature/feature.xml +++ b/features/com.minres.scviewer.e4.platform.feature/feature.xml @@ -33,6 +33,9 @@ + + + com.minres.scviewer com.minres.scviewer.parent - 2.0.0-SNAPSHOT + 2.11.0 ../.. 1.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.feature/build.properties b/features/com.minres.scviewer.feature/build.properties index b3a611b..3a8958f 100644 --- a/features/com.minres.scviewer.feature/build.properties +++ b/features/com.minres.scviewer.feature/build.properties @@ -1,2 +1,4 @@ bin.includes = feature.xml,\ feature.properties +src.includes = feature.properties,\ + feature.xml diff --git a/features/com.minres.scviewer.feature/feature.xml b/features/com.minres.scviewer.feature/feature.xml index e5989c3..69577f6 100644 --- a/features/com.minres.scviewer.feature/feature.xml +++ b/features/com.minres.scviewer.feature/feature.xml @@ -2,7 +2,7 @@ @@ -12,7 +12,7 @@ built-in text base recording. - Copyright (c) 2015 MINRES Technologies GmbH. + Copyright (c) 2015-2021 MINRES Technologies GmbH. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -24,22 +24,11 @@ http://www.eclipse.org/legal/epl-v10.html - - - - - - - @@ -51,7 +40,8 @@ http://www.eclipse.org/legal/epl-v10.html - + + com.minres.scviewer com.minres.scviewer.parent - 2.0.0-SNAPSHOT + 2.11.0 ../.. - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/features/com.minres.scviewer.ui.feature/build.properties b/features/com.minres.scviewer.ui.feature/build.properties index 64f93a9..3a8958f 100644 --- a/features/com.minres.scviewer.ui.feature/build.properties +++ b/features/com.minres.scviewer.ui.feature/build.properties @@ -1 +1,4 @@ -bin.includes = feature.xml +bin.includes = feature.xml,\ + feature.properties +src.includes = feature.properties,\ + feature.xml diff --git a/features/com.minres.scviewer.ui.feature/feature.properties b/features/com.minres.scviewer.ui.feature/feature.properties new file mode 100644 index 0000000..704f2e1 --- /dev/null +++ b/features/com.minres.scviewer.ui.feature/feature.properties @@ -0,0 +1,102 @@ +featureName=SCViewer UI elements +providerName=MINRES Technologies GmbH +updateSiteName=SC Viewer UI Updates +description=A viewer for SystemC Verification Library transactions and VCD signals. +licenseURL=license.html +license=\ +ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ +March 17, 2005\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ +USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ +AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ +AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public\n\ +License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ +Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +For purposes of the EPL, "Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code,\n\ +documentation and other files maintained in the Eclipse.org CVS\n\ +repository ("Repository") in CVS modules ("Modules") and made available\n\ +as downloadable archives ("Downloads").\n\ +\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ +\n\ +Features may also include other Features ("Included Features"). Files named\n\ +"feature.xml" may contain a list of the names and version numbers of\n\ +Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be\n\ +contained in files named "about.html" ("Abouts"). The terms and\n\ +conditions governing Features and Included Features should be contained\n\ +in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ +Licenses may be located in any directory of a Download or Module\n\ +including, but not limited to the following locations:\n\ +\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ +Eclipse Update Manager, you must agree to a license ("Feature Update\n\ +License") during the installation process. If the Feature contains\n\ +Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform\n\ +you where you can locate them. Feature Update Licenses may be found in\n\ +the "license" property of files named "feature.properties". Such Abouts,\n\ +Feature Licenses and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your\n\ +use of the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ +TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ +SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ +TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ +govern that particular Content.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are\n\ +currently may have restrictions on the import, possession, and use,\n\ +and/or re-export to another country, of encryption software. BEFORE\n\ +using any encryption software, please check the country's laws,\n\ +regulations and policies concerning the import, possession, or use,\n\ +and re-export of encryption software, to see if this is permitted.\n\ +\n\ +Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n diff --git a/features/com.minres.scviewer.ui.feature/feature.xml b/features/com.minres.scviewer.ui.feature/feature.xml index 26fb07f..16baa04 100644 --- a/features/com.minres.scviewer.ui.feature/feature.xml +++ b/features/com.minres.scviewer.ui.feature/feature.xml @@ -1,34 +1,37 @@ + label="%featureName" + version="1.1.0.qualifier" + provider-name="%providerName"> - - [Enter Feature Description here.] + + The UI for the SCViewer databases - - [Enter Copyright Description here.] + + Copyright (c) 2015-2021 MINRES Technologies GmbH. +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License +v1.0 which accompanies this distribution, and is available at +http://www.eclipse.org/legal/epl-v10.html - - [Enter License Description here.] + + %license - + + + - - + com.minres.scviewer com.minres.scviewer.parent - 2.0.0-SNAPSHOT + 2.11.0 ../.. - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/p2repositories/com.minres.scviewer.updateSite/category.xml b/p2repositories/com.minres.scviewer.updateSite/category.xml index 4b66073..204beb5 100644 --- a/p2repositories/com.minres.scviewer.updateSite/category.xml +++ b/p2repositories/com.minres.scviewer.updateSite/category.xml @@ -1,15 +1,32 @@ - - + + - - + + - + + + + + + + + + + + + + - Viewer for SystemC Verification (SCV) library's transaction recording + Viewer for transaction recording outputs of the SystemC Verification (SCV) library - + + + Components to deal with the transaction recording outputs of the SystemC Verification (SCV) library + + + diff --git a/p2repositories/com.minres.scviewer.updateSite/pom.xml b/p2repositories/com.minres.scviewer.updateSite/pom.xml index 3634c3d..6162d7f 100644 --- a/p2repositories/com.minres.scviewer.updateSite/pom.xml +++ b/p2repositories/com.minres.scviewer.updateSite/pom.xml @@ -1,20 +1,86 @@ - 4.0.0 com.minres.scviewer.updateSite + 2.11.0-SNAPSHOT eclipse-repository com.minres.scviewer com.minres.scviewer.parent - 2.0.0-SNAPSHOT + 2.11.0 ../.. - - \ No newline at end of file + + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + ${project.artifactId}-${qualifiedVersion} + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + parse-version + + parse-version + + + + + + + + + + release-composite + + false + + + + + com.carrotgarden.maven + bintray-maven-plugin + 1.5.20191113165555 + + false + + minres + + eclipse + + SCViewer + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + https://git.minres.com/VP-Tools/SCViewer.git + + ${project.build.directory}/repository + + scviewer-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + + + bintray-minres-deploy + + + + + package + + upload + + + + + + + + + + \ No newline at end of file diff --git a/p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html b/p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html index 5808011..5324abb 100644 --- a/p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html +++ b/p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html @@ -1,6 +1,6 @@ -com.itjw.txviewer.updateSite +SCViewer Update site