Changeset 19725

Show
Ignore:
Timestamp:
12/20/06 18:07:57 (2 years ago)
Author:
patrick
Message:

Merges from the 2.0 branch:

r19716: Add a hook so that users can take advantage of parallel

compilation when building the RPMs.

r19718: Added another package that contains only the architecture-specific

Tweek JNI library. This makes it so that all the other
Java-related packages are now architecture-independent.

r19719: Added "umbrella" packages called juggler, juggler-devel, and

juggler-java. These are empty packages that require the various
pieces of the Juggler Suite needed for running and compiling VR
Juggler C++ applications as well as VRJConfig and its
dependencies. This should allow users of YUM or APT to do
something as simple as install the juggler package to get
everything needed to run a pre-compiled VR Juggler application.

r19720: The Juggler build uses "i386" as the architecture identifier when

building on an IA-32 architecture.

r19721: Change JacORB license information to be associated with the

tweek-java package.

r19722: While the Juggler build uses i386 in the lib directory for IA-32

builds, the Tweek JNI shared library gets installed into a
subdirectory named i686.

r19723: Spell the JCCL C++ package name correctly. Now, juggler and

juggler-devel work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/release/vrjuggler.spec

    r19715 r19725  
    2626 
    2727%ifarch i386 i486 i586 
    28 %define vj_arch i686 
     28%define vj_arch i386 
     29%define tweek_arch i686 
    2930%else 
    3031%define vj_arch %{_arch} 
     32%define tweek_arch %{_arch} 
     33%endif 
     34 
     35%ifarch x86_64 
     36%define abi_option --with-abi=ELF_x86_64 
     37%else 
     38%ifarch i386 i486 i586 
     39%define abi_option --with-abi=ELF_i386 
     40%endif 
    3141%endif 
    3242 
    …… 
    128138Tweek C++ API. 
    129139 
     140%package -n tweek-java-jni 
     141Summary: The JNI parts of the Tweek Java API 
     142Version: %{tweek_version} 
     143Release: %{tweek_release} 
     144URL: http://www.vrjuggler.org/tweek/ 
     145Group: Development/Java 
     146Requires: j2sdk >= %{min_jdk} 
     147Provides: tweek-java-jni = %{tweek_version}-%{tweek_release} 
     148AutoReqProv: no 
     149 
     150%description -n tweek-java-jni 
     151The Tweek Java API JNI library proivdes a natively compiled extension used 
     152by some parts of the Tweek Java GUI. 
     153 
    130154%package -n tweek-java 
    131155Summary: The Tweek Java API and GUI 
    …… 
    135159Group: Development/Java 
    136160Requires: j2sdk >= %{min_jdk} 
     161Requires: tweek-java-jni = %{tweek_version}-%{tweek_release} 
    137162Provides: tweek-java = %{tweek_version}-%{tweek_release} 
    138163AutoReqProv: no 
    …… 
    422447Release: %{vrjuggler_release} 
    423448URL: http://www.vrjuggler.org/vrjuggler/ 
    424 Group: Development/C++ 
     449Group: Development/Java 
    425450Requires: j2sdk >= %{min_jdk} 
    426451Requires: tweek-java = %{tweek_version}-%{tweek_release} 
    …… 
    432457monitoring through CORBA. 
    433458 
    434 %ifarch x86_64 
    435 %define abi_option --with-abi=ELF_x86_64 
    436 %else 
    437 %ifarch i386 
    438 %define abi_option --with-abi=ELF_i386 
    439 %endif 
    440 %endif 
     459%package -n juggler 
     460Summary: The Juggler Suite 
     461Version: %{vrjuggler_version} 
     462Release: %{vrjuggler_release} 
     463Group: Development/C++ 
     464License: LGPL 
     465URL: http://www.vrjuggler.org/ 
     466Requires: vpr = %{vpr_version}-%{vpr_release} 
     467Requires: jccl-c++ = %{jccl_version}-%{jccl_release} 
     468Requires: gadgeteer = %{gadgeteer_version}-%{gadgeteer_release} 
     469Requires: sonix = %{sonix_version}-%{sonix_release} 
     470Requires: vrjuggler = %{vrjuggler_version}-%{vrjuggler_release} 
     471Requires: vrjuggler-opengl = %{vrjuggler_version}-%{vrjuggler_release} 
     472 
     473%description -n juggler 
     474The Juggler Suite provides virtual reality (VR) software developers with a 
     475collection of application programming interfaces (APIs) that abstract, and 
     476hence simplify, all interface aspects of their program including the display 
     477surfaces, object tracking, selection and navigation, graphics rendering 
     478engines, and graphical user interfaces. An application written with the 
     479Juggler Suite is essentially independent of device, computer platform, and 
     480VR system. Applications based on the Juggler Suite may be run with any 
     481combination of immersive technologies and computational hardware. 
     482 
     483%package -n juggler-devel 
     484Summary: The Juggler Suite C++ developer interface 
     485Version: %{vrjuggler_version} 
     486Release: %{vrjuggler_release} 
     487Group: Development/C++ 
     488License: LGPL 
     489URL: http://www.vrjuggler.org/ 
     490Requires: vpr-devel = %{vpr_version}-%{vpr_release} 
     491Requires: jccl-c++-devel = %{jccl_version}-%{jccl_release} 
     492Requires: gadgeteer-devel = %{gadgeteer_version}-%{gadgeteer_release} 
     493Requires: sonix-devel = %{sonix_version}-%{sonix_release} 
     494Requires: vrjuggler-devel = %{vrjuggler_version}-%{vrjuggler_release} 
     495Requires: vrjuggler-opengl-devel = %{vrjuggler_version}-%{vrjuggler_release} 
     496Requires: doozer < 2.1 
     497 
     498%description -n juggler-devel 
     499The header files and libraries needed for developing VR applications using 
     500the Juggler Suite. 
     501 
     502%package -n juggler-java 
     503Summary: The Juggler Suite Java software 
     504Version: %{vrjuggler_version} 
     505Release: %{vrjuggler_release} 
     506Group: Development/Java 
     507License: LGPL 
     508URL: http://www.vrjuggler.org/ 
     509Requires: tweek-java = %{vpr_version}-%{vpr_release} 
     510Requires: jccl-java = %{jccl_version}-%{jccl_release} 
     511Requires: jccl-rtrc-plugin-java = %{jccl_version}-%{jccl_release} 
     512Requires: vrjconfig = %{vrjuggler_version}-%{vrjuggler_release} 
     513Requires: vrjuggler-perf-plugin-java = %{vrjuggler_version}-%{vrjuggler_release} 
     514 
     515%description -n juggler-java 
     516The Java software from the Juggler Suite including VRJConfig. 
    441517 
    442518%prep 
    …… 
    450526 
    451527%build 
    452 make BUILD_PROF_C=N BUILD_PROF_CXX=N build 
     528make %{?_smp_mflags} BUILD_PROF_C=N BUILD_PROF_CXX=N build 
    453529 
    454530%install 
    …… 
    549625%{_libdir}/%{vj_arch}/*/libtweek.so.* 
    550626%{_prefix}/share/tweek/data 
    551 %{_prefix}/share/tweek/LICENSE 
    552 %{_prefix}/share/tweek/README.source 
    553627%doc COPYING.txt modules/tweek/ChangeLog 
    554628 
    …… 
    570644 
    571645%if %have_java 
     646%files -n tweek-java-jni 
     647%defattr(-, root, root) 
     648%{_prefix}/share/tweek/java/%{tweek_arch} 
     649 
    572650%files -n tweek-java 
    573651%defattr(-, root, root) 
    …… 
    578656%{_bindir}/tweek-base.sh 
    579657%{_prefix}/share/tweek/beans 
    580 %{_prefix}/share/tweek/java 
     658%{_prefix}/share/tweek/java/*.jar 
     659%{_prefix}/share/tweek/java/*.txt 
     660%{_prefix}/share/tweek/LICENSE 
     661%{_prefix}/share/tweek/README.source 
    581662%doc COPYING.txt modules/tweek/ChangeLog 
    582663%endif 
    …… 
    783864%endif 
    784865 
     866%files -n juggler 
     867%defattr(-, root, root) 
     868# Empty RPM 
     869 
     870%files -n juggler-devel 
     871%defattr(-, root, root) 
     872# Empty RPM 
     873 
     874%if %have_java 
     875%files -n juggler-java 
     876%defattr(-, root, root) 
     877# Empty RPM 
     878%endif 
     879 
    785880%changelog 
    786881* Fri Aug 25 2006 Patrick Hartling