[hg] releases: introduce build artifacts

  • From: Alexander Simon < >
  • To:
  • Subject: [hg] releases: introduce build artifacts
  • Date: Fri, 01 Feb 2013 10:08:50 -0800

changeset 6b1bfff4db8e in releases ((none))
details: http://hg.netbeans.org/releases/rev/6b1bfff4db8e
description:
        introduce build artifacts

diffstat:

 cnd.discovery/nbproject/project.properties                                   
                                |   2 +-
 cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/Configuration.java  
                                |   5 +
 cnd.dwarfdiscovery/nbproject/project.xml                                     
                                |   2 +-
 
cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecLog.java
                  |  50 ++++++++++
 
cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecutable.java
               |   5 +
 
cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeFolder.java
                   |   5 +
 
cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeMakeLog.java
                  |   5 +
 
cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/DwarfProvider.java
                   |   5 +
 
cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/CodeAssistanceConfiguration.java
 |   2 +-
 cnd.modeldiscovery/nbproject/project.xml                                     
                                |   2 +-
 
cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/AnalyzeModel.java
                    |   5 +
 11 files changed, 84 insertions(+), 4 deletions(-)

diffs (232 lines):

diff --git a/cnd.discovery/nbproject/project.properties 
b/cnd.discovery/nbproject/project.properties
--- a/cnd.discovery/nbproject/project.properties
+++ b/cnd.discovery/nbproject/project.properties
@@ -1,6 +1,6 @@
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.6
-spec.version.base=1.30
+spec.version.base=1.31
 release.external/cnd-build-trace-1.0.zip!/SunOS-x86/libBuildTrace.so        
= bin/SunOS-x86/libBuildTrace.so
 release.external/cnd-build-trace-1.0.zip!/SunOS-x86_64/libBuildTrace.so     
= bin/SunOS-x86_64/libBuildTrace.so
 release.external/cnd-build-trace-1.0.zip!/SunOS-sparc/libBuildTrace.so      
= bin/SunOS-sparc/libBuildTrace.so
diff --git 
a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/Configuration.java 
b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/Configuration.java
--- 
a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/Configuration.java
+++ 
b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/Configuration.java
@@ -64,6 +64,11 @@
     List<String> getDependencies();
 
     /**
+     * Returns build artifacts: binaries and libraries
+     */
+    List<String> getBuildArtifacts();
+
+    /**
      * Returns list of source files properties. 
      */
     List<SourceFileProperties> getSourcesConfiguration();
diff --git a/cnd.dwarfdiscovery/nbproject/project.xml 
b/cnd.dwarfdiscovery/nbproject/project.xml
--- a/cnd.dwarfdiscovery/nbproject/project.xml
+++ b/cnd.dwarfdiscovery/nbproject/project.xml
@@ -28,7 +28,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.29</specification-version>
+                        <specification-version>1.31</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecLog.java
 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecLog.java
--- 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecLog.java
+++ 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecLog.java
@@ -48,6 +48,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -283,6 +284,11 @@
                 }
 
                 @Override
+                public List<String> getBuildArtifacts() {
+                    return null;
+                }
+
+                @Override
                 public List<SourceFileProperties> getSourcesConfiguration() {
                     if (myFileProperties == null) {
                         String set = (String) 
getProperty(EXEC_LOG_KEY).getValue();
@@ -318,6 +324,7 @@
         private final Set<String> C_NAMES;
         private final Set<String> CPP_NAMES;
         private final Set<String> FORTRAN_NAMES;
+        private final Set<String> LIBREARIES_NAMES;
 
         public ExecLogReader(String fileName, String root, ProjectProxy 
project) {
             if (root.length() > 0) {
@@ -333,6 +340,9 @@
             C_NAMES = DiscoveryUtils.getCompilerNames(project, 
PredefinedToolKind.CCompiler);
             CPP_NAMES = DiscoveryUtils.getCompilerNames(project, 
PredefinedToolKind.CCCompiler);
             FORTRAN_NAMES = DiscoveryUtils.getCompilerNames(project, 
PredefinedToolKind.FortranCompiler);
+            LIBREARIES_NAMES = new HashSet<String>();
+            LIBREARIES_NAMES.add("ld"); //NOI18N
+            LIBREARIES_NAMES.add("ar"); //NOI18N
         }
         
         private PathMap getPathMapper(ProjectProxy project) {
@@ -460,6 +470,9 @@
                 language = LanguageKind.CPP;
             } else if (FORTRAN_NAMES.contains(compiler)) {
                 language = LanguageKind.Fortran;
+            } else if (LIBREARIES_NAMES.contains(compiler)) {
+                processLibrary(compiler, args, storage);
+                return;
             } else {
                 language = LanguageKind.Unknown;
             }
@@ -601,6 +614,43 @@
                 }
             }
         }
+        
+        private void processLibrary(String tool, List<String> args, 
CompileLineStorage storage) {
+            //TODO: get library name
+/*            
+called: /usr/ccs/bin/ld
+       
/var/tmp/alsimon-cnd-test-downloads/pkg-config-0.25/glib-1.2.10/gmodule
+       /usr/ccs/bin/ld
+       -zld32=-S/tmp/lib_link.1359732141.24769.01/libldstab_ws.so
+       -zld64=-S/tmp/lib_link.1359732141.24769.01/amd64/libldstab_ws.so
+       -zld32=-S/tmp/lib_link.1359732141.24769.01/libld_annotate.so
+       -zld64=-S/tmp/lib_link.1359732141.24769.01/amd64/libld_annotate.so
+       /opt/solarisstudio12.3/prod/lib/crti.o
+       /opt/solarisstudio12.3/prod/lib/crt1.o
+       /opt/solarisstudio12.3/prod/lib/values-xa.o
+       testgmodule.o
+       ./.libs/libgmodule.a
+       ../.libs/libglib.a
+       -o
+       testgmodule
+       -Y
+       P,/opt/solarisstudio12.3/prod/lib:/usr/ccs/lib:/lib:/usr/lib
+       -Qy
+       -lc
+       /opt/solarisstudio12.3/prod/lib/crtn.o
+
+called: /usr/ccs/bin/ar
+       /var/tmp/alsimon-cnd-test-downloads/pkg-config-0.25/popt
+       ar
+       cru
+       .libs/libpopt.a
+       .libs/popt.o
+       .libs/poptconfig.o
+       .libs/popthelp.o
+       .libs/poptparse.o
+       .libs/findme.o
+*/            
+        }
     }
     
     private static class ExecSource extends RelocatableImpl implements 
SourceFileProperties {
diff --git 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecutable.java
 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecutable.java
--- 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecutable.java
+++ 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeExecutable.java
@@ -312,6 +312,11 @@
                     }
                     return new ArrayList<String>(myDependencies);
                 }
+
+                @Override
+                public List<String> getBuildArtifacts() {
+                    return null;
+                }
                 
                 @Override
                 public List<SourceFileProperties> getSourcesConfiguration() {
diff --git 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeFolder.java
 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeFolder.java
--- 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeFolder.java
+++ 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeFolder.java
@@ -228,6 +228,11 @@
                 public List<String> getDependencies() {
                     return null;
                 }
+
+                @Override
+                public List<String> getBuildArtifacts() {
+                    return null;
+                }
                 
                 @Override
                 public List<SourceFileProperties> getSourcesConfiguration() {
diff --git 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeMakeLog.java
 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeMakeLog.java
--- 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeMakeLog.java
+++ 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/AnalyzeMakeLog.java
@@ -291,6 +291,11 @@
                 public List<String> getDependencies() {
                     return null;
                 }
+
+                @Override
+                public List<String> getBuildArtifacts() {
+                    return null;
+                }
                 
                 @Override
                 public List<SourceFileProperties> getSourcesConfiguration() {
diff --git 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/DwarfProvider.java
 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/DwarfProvider.java
--- 
a/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/DwarfProvider.java
+++ 
b/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/DwarfProvider.java
@@ -145,6 +145,11 @@
                 public List<String> getDependencies() {
                     return null;
                 }
+
+                @Override
+                public List<String> getBuildArtifacts() {
+                    return null;
+                }
                 
                 @Override
                 public List<SourceFileProperties> getSourcesConfiguration() {
diff --git 
a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/CodeAssistanceConfiguration.java
 
b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/CodeAssistanceConfiguration.java
--- 
a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/CodeAssistanceConfiguration.java
+++ 
b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/CodeAssistanceConfiguration.java
@@ -60,7 +60,7 @@
     private VectorConfiguration<String> transientMacros;
     private VectorConfiguration<String> environmentVariables;
     private StringConfiguration tools;
-    private static final String DEFAULT_TOOLS = 
"gcc:c++:g++:clang:clang++:icc:icpc:ifort:gfortran:g77:g90:g95:cc:CC:ffortran:f77:f90:f95";
 //NOI18N
+    private static final String DEFAULT_TOOLS = 
"gcc:c++:g++:clang:clang++:icc:icpc:ifort:gfortran:g77:g90:g95:cc:CC:ffortran:f77:f90:f95:ar:ld";
 //NOI18N
     
     // Constructors
     public CodeAssistanceConfiguration(MakeConfiguration makeConfiguration) {
diff --git a/cnd.modeldiscovery/nbproject/project.xml 
b/cnd.modeldiscovery/nbproject/project.xml
--- a/cnd.modeldiscovery/nbproject/project.xml
+++ b/cnd.modeldiscovery/nbproject/project.xml
@@ -46,7 +46,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.19.1</specification-version>
+                        <specification-version>1.31</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git 
a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/AnalyzeModel.java
 
b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/AnalyzeModel.java
--- 
a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/AnalyzeModel.java
+++ 
b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/AnalyzeModel.java
@@ -316,6 +316,11 @@
         public List<String> getDependencies() {
             return null;
         }
+
+        @Override
+        public List<String> getBuildArtifacts() {
+            return null;
+        }
         
         public boolean isExcluded(Item item){
             MakeConfiguration makeConfiguration = 
item.getFolder().getConfigurationDescriptor().getActiveConfiguration();

[hg] releases: introduce build artifacts

Alexander Simon 02/01/2013

Project Features

About this Project

CND was started in November 2009, is owned by Leonid Lenyashin, and has 130 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20140418.2d69abc). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close