Changeset 7856 for trunk


Ignore:
Timestamp:
12/29/11 21:18:42 (8 years ago)
Author:
aivar
Message:

Simplified the platform specific paths from "x86_64-MacOSX-gpp" to "osx_64" for example. The NAR plugin AOL style path names were too complicated and we don't need the linker name.

Location:
trunk/projects/curve-fitter
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/projects/curve-fitter/pom.xml

    r7853 r7856  
    9494              <ignore>true</ignore> 
    9595              <classifiers> 
    96                 <!-- if one classifier fails, rest are ignored --> 
     96                <!-- if one classifier fails, rest are ignored -->     
    9797                <classifier>x86_64-MacOSX-gpp-shared</classifier> 
     98                <classifier>x86-Windows-msvc-shared</classifier>   
    9899                <classifier>amd64-Linux-gpp-shared</classifier> 
    99                 <classifier>x86-Windows-msvc-shared</classifier> 
    100100              </classifiers> 
    101101              <libraries> 
  • trunk/projects/curve-fitter/src/main/assembly/with-libs.xml

    r7853 r7856  
    1414    </fileSet> 
    1515    <fileSet> 
     16      <directory>${project.build.directory}/nar/lib/x86_64-MacOSX-gpp/shared</directory> 
     17      <outputDirectory>META-INF/lib/osx_64</outputDirectory> 
     18      <includes> 
     19        <include>*.dylib</include> 
     20      </includes> 
     21    </fileSet> 
     22    <fileSet> 
     23      <directory>${project.build.directory}/nar/lib/x86-Windows-msvc/shared</directory> 
     24      <outputDirectory>META-INF/lib/windows_32</outputDirectory> 
     25      <includes> 
     26        <include>*.dll</include> 
     27      </includes> 
     28    </fileSet> 
     29    <fileSet> 
    1630      <directory>${project.build.directory}/nar/lib/amd64-Linux-gpp/shared</directory> 
    17       <outputDirectory>META-INF/lib/amd64-Linux-gpp</outputDirectory> 
     31      <outputDirectory>META-INF/lib/linux_64</outputDirectory> 
    1832      <includes> 
    1933        <include>*.so</include> 
     
    2135    </fileSet> 
    2236    <fileSet> 
    23       <directory>${project.build.directory}/nar/lib/x86_64-MacOSX-gpp/shared</directory> 
    24       <outputDirectory>META-INF/lib/x86_64-MacOSX-gpp</outputDirectory> 
    25       <includes> 
    26         <include>*.dylib</include> 
    27       </includes> 
    28     </fileSet> 
    29     <!-- fileSet> 
    30       <directory>${project.build.directory}/nar/lib/x86-Windows-msvc/shared</directory> 
    31       <outputDirectory>lib/x86-Windows-msvc</outputDirectory> 
    32       <includes> 
    33         <include>*.dll</include> 
    34       </includes> 
    35     </fileSet> 
    36     <fileSet> 
    3737      <directory>${project.build.directory}/nar/lib/i386-Linux-g++/shared</directory> 
    38       <outputDirectory>lib/i386-Linux-g++</outputDirectory> 
     38      <outputDirectory>META-INF/lib/linux_32</outputDirectory> 
    3939      <includes> 
    4040        <include>*.so</include> 
    4141      </includes> 
    42     </fileSet --> 
     42    </fileSet> 
    4343  </fileSets> 
    4444</assembly> 
Note: See TracChangeset for help on using the changeset viewer.