Skip to content

Commit

Permalink
Merge pull request #238 from cnescatlab/develop
Browse files Browse the repository at this point in the history
Remove shell (#237)
  • Loading branch information
louisjdmartin authored Jun 20, 2024
2 parents 5ce536e + d5a1a85 commit 1fca61c
Show file tree
Hide file tree
Showing 196 changed files with 14 additions and 34,665 deletions.
40 changes: 0 additions & 40 deletions .github/workflows/java-continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,43 +41,3 @@ jobs:
restore-keys: ${{ runner.os }}-yarn-
- name: Build with Maven
run: mvn -B clean install
code-analysis:
runs-on: ubuntu-latest
name: SonarCloud Code Analysis
# It's not possible to launch an analysis on external pull requests
if: ${{ github.repository_owner == 'cnescatlab' }}
steps:
- name: Check out repository code
uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Setup java
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Cache node_modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-yarn-
- name: Cache SonarCloud packages
uses: actions/cache@v2
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Build and analyze
env:
# Needed to get some information about the pull request, if any
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SonarCloud access token should be generated from https://sonarcloud.io/account/security/
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.organization=lequal -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![SonarQube Coverage](https://sonarcloud.io/api/project_badges/measure?project=lequal_i-CodeCNES&metric=coverage)](https://sonarcloud.io/component_measures?id=lequal_i-CodeCNES&metric=Coverage)
[![SonarQube Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=lequal_i-CodeCNES&metric=sqale_index)](https://sonarcloud.io/component_measures?id=lequal_i-CodeCNES&metric=Maintainability)

i-Code CNES is a static code analysis tool to help developers write code compliant with CNES coding rules for Fortran 77, Fortran 90 and Shell.
i-Code CNES is a static code analysis tool to help developers write code compliant with CNES coding rules for Fortran 77 and Fortran 90 .

All the information on CNES standards coverage, and rules availabilities and limitations can be read in the [documentation](https://github.com/cnescatlab/i-CodeCNES/wiki).

Expand Down Expand Up @@ -49,7 +49,7 @@ Refer to SonarQube documentation to know how to install a standard SonarQube plu
Use `icode -h` to get the following help about *i-Code*:
```
usage: icode [<FILE> [...]] [-c <arg>] [-e] [-f <arg>] [-h] [-l] [-o <arg>] [-p <arg>] [-q <arg>] [-r] [-v] [-x <arg>]
Analyze Shell, F77 & F90 code to find defects & bugs.
Analyze F77 & F90 code to find defects & bugs.
-c,--checked-languages <arg> Comma separated list of languages checked during analysis. All by default.
-e,--exporters Display all available exporters.
Expand Down
6 changes: 0 additions & 6 deletions icode-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@
<version>${icode.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>fr.cnes.icode</groupId>
<artifactId>shell-language</artifactId>
<version>${icode.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public boolean parse(final String[] pArgs) {
// If help option is present we print it.
if(!areOptionsCorrect || commandLine.hasOption(HELP)) {
helpFormatter.printHelp(128, "icode [<FILE> [...]]",
"Analyze Shell, F77 & F90 code to find defects & bugs.\n\n", options,
"Analyze F77 & F90 code to find defects & bugs.\n\n", options,
"\n\nPlease report issues at https://github.com/cnescatlab/i-CodeCNES/issues", true);
// If version option is present, version information are displayed.
} else if (commandLine.hasOption(VERSION)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public void testSupportedLanguages() {
assertFalse(icodeLog.contains("+ C++"));
assertFalse(icodeLog.contains("+ C"));
assertFalse(icodeLog.contains("+ Python"));
assertTrue(icodeLog.contains("+ Shell"));
assertTrue(icodeLog.contains("+ Fortran 77"));
assertTrue(icodeLog.contains("+ Fortran 90"));

Expand Down
121 changes: 0 additions & 121 deletions icode-ide/fr.cnes.analysis.tools.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,6 @@
id="fr.cnes.analysis.tools.ui.editors.EditorFortran"
name="Fortran Editor">
</editor>
<editor
class="fr.cnes.analysis.tools.ui.editors.EditorShell"
contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
default="false"
extensions="sh,ksh"
icon="icons/shell.png"
id="fr.cnes.analysis.tools.ui.editors.EditorShell"
name="Shell editor">
</editor>
</extension>
<extension point="org.eclipse.core.resources.markers" id="fr.cnes.analysis.tools.ui.markers.ViolationWarningMarker"
name="i-Code CNES Violation Warning">
Expand Down Expand Up @@ -327,34 +318,6 @@
minValue="20"
name="F90.MET.RatioComment.D">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETComplexitySimplified"
description="McCabe simplfied number should not exceed 20."
enabled="true"
maxValue="20"
name="SH.MET.ComplexitySimplified.D">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETLineOfCode"
description="Number of line of a function (without blank and comment lines) should not exceed 100."
enabled="true"
maxValue="100"
name="SH.MET.LineOfCode.D">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETNesting"
description="Nesting of a control structure should not exceed 7."
enabled="true"
maxValue="7"
name="SH.MET.Nesting.D">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETRatioComment"
description="Comment Ratio (commentlines/(totalLines+commentLines)) must not be below 20%."
enabled="true"
minValue="20"
name="SH.MET.RatioComment.D">
</checkConfiguration>
</configuration>
<configuration
description="Configuration defined by RNC-CNES-Q-HB-80-501 class C"
Expand Down Expand Up @@ -415,34 +378,6 @@
minValue="20"
name="F90.MET.RatioComment.C">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETComplexitySimplified"
description="McCabe simplfied number should not exceed 12."
enabled="true"
maxValue="12"
name="SH.MET.ComplexitySimplified.C">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETLineOfCode"
description="Number of line of a function (without blank and comment lines) should not exceed 80."
enabled="true"
maxValue="80"
name="SH.MET.LineOfCode.C">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETNesting"
description="Nesting of a control structure should not exceed 6."
enabled="true"
maxValue="6"
name="SH.MET.Nesting.C">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETRatioComment"
description="Comment Ratio (commentlines/(totalLines+commentLines)) must not be below 20%."
enabled="true"
minValue="20"
name="SH.MET.RatioComment.C">
</checkConfiguration>
</configuration>
<configuration
description="Configuration defined by RNC-CNES-Q-HB-80-501 class B"
Expand Down Expand Up @@ -503,34 +438,6 @@
minValue="30"
name="F90.MET.RatioComment.B">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETComplexitySimplified"
description="McCabe simplfied number should not exceed 10."
enabled="true"
maxValue="10"
name="SH.MET.ComplexitySimplified.B">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETLineOfCode"
description="Number of line of a function (without blank and comment lines) should not exceed 60."
enabled="true"
maxValue="60"
name="SH.MET.LineOfCode.B">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETNesting"
description="Nesting of a control structure should not exceed 5."
enabled="true"
maxValue="5"
name="SH.MET.Nesting.B">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETRatioComment"
description="Comment Ratio (commentlines/(totalLines+commentLines)) must not be below 30%"
enabled="true"
minValue="30"
name="SH.MET.RatioComment.B">
</checkConfiguration>
</configuration>
<configuration
description="Configuration defined by RNC-CNES-Q-HB-80-501 class A"
Expand Down Expand Up @@ -591,34 +498,6 @@
minValue="30"
name="F90.MET.RatioComment.A">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETComplexitySimplified"
description="McCabe simplfied number should not exceed 10."
enabled="true"
maxValue="10"
name="SH.MET.ComplexitySimplified.A">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETLineOfCode"
description="Number of line of a function (without blank and comment lines) should not exceed 60."
enabled="true"
maxValue="60"
name="SH.MET.LineOfCode.A">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETNesting"
description="Nesting of a control structure should not exceed 5."
enabled="true"
maxValue="5"
name="SH.MET.Nesting.A">
</checkConfiguration>
<checkConfiguration
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETRatioComment"
description="Comment Ratio (commentlines/(totalLines+commentLines)) must not be below 30%"
enabled="true"
minValue="30"
name="SH.MET.RatioComment.A">
</checkConfiguration>
</configuration>
</extension>
<extension point="org.eclipse.ui.editors.markerAnnotationSpecification"
Expand Down

This file was deleted.

4 changes: 0 additions & 4 deletions icode-ide/fr.cnes.icode.repository/icode-ide.product
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
<plugin id="fr.cnes.analysis.tools.fortran90.metrics"/>
<plugin id="fr.cnes.analysis.tools.fortran90.rules"/>
<plugin id="fr.cnes.analysis.tools.fortran90.ui"/>
<plugin id="fr.cnes.analysis.tools.shell.analyzer"/>
<plugin id="fr.cnes.analysis.tools.shell.metrics"/>
<plugin id="fr.cnes.analysis.tools.shell.rules"/>
<plugin id="fr.cnes.analysis.tools.shell.ui"/>
<plugin id="fr.cnes.analysis.tools.ui"/>
</plugins>

Expand Down
3 changes: 0 additions & 3 deletions icode-ide/icode-library-plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ Export-Package: com.google.common.annotations,
fr.cnes.icode.services.export,
fr.cnes.icode.services.export.exception,
fr.cnes.icode.services.languages,
fr.cnes.icode.shell,
fr.cnes.icode.shell.metrics,
fr.cnes.icode.shell.rules,
javassist,
javassist.bytecode,
javassist.bytecode.analysis,
Expand Down
15 changes: 0 additions & 15 deletions icode-library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,6 @@
<artifactId>fortran90-rules</artifactId>
<version>${icode.version}</version>
</dependency>
<dependency>
<groupId>fr.cnes.icode</groupId>
<artifactId>shell-language</artifactId>
<version>${icode.version}</version>
</dependency>
<dependency>
<groupId>fr.cnes.icode</groupId>
<artifactId>shell-metrics</artifactId>
<version>${icode.version}</version>
</dependency>
<dependency>
<groupId>fr.cnes.icode</groupId>
<artifactId>shell-rules</artifactId>
<version>${icode.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
<module>fortran90-metrics</module>
<module>fortran90-rules</module>

<module>shell-language</module>
<module>shell-metrics</module>
<module>shell-rules</module>

<module>export-xml</module>
<module>export-csv</module>

Expand All @@ -35,7 +31,7 @@
</modules>

<name>i-Code parent</name>
<description>CNES app analyzing Fortran 77, Fortran 90 and Shell files.</description>
<description>CNES app analyzing Fortran 77 and Fortran 90 files.</description>

<organization>
<name>CNES</name>
Expand Down Expand Up @@ -70,7 +66,7 @@
</distributionManagement>

<properties>
<icode.version>4.1.2</icode.version>
<icode.version>5.0.0</icode.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down Expand Up @@ -113,6 +109,10 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surfire.version}</version>
<groupId>org.apache.maven.plugins</groupId>
<configuration>
<forkCount>0</forkCount>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down
28 changes: 0 additions & 28 deletions shell-language/pom.xml

This file was deleted.

Loading

0 comments on commit 1fca61c

Please sign in to comment.