Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
floodlight
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
croft1
floodlight
Commits
f6fa3ce3
Commit
f6fa3ce3
authored
12 years ago
by
Rich Lane
Browse files
Options
Downloads
Patches
Plain Diff
debian packaging: use system libraries when possible
parent
a7c8be74
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
build.xml
+22
-1
22 additions, 1 deletion
build.xml
debian/floodlight.install
+1
-1
1 addition, 1 deletion
debian/floodlight.install
debian/misc/floodlight
+1
-1
1 addition, 1 deletion
debian/misc/floodlight
with
24 additions
and
3 deletions
build.xml
+
22
−
1
View file @
f6fa3ce3
...
...
@@ -35,8 +35,9 @@
<property
name=
"packetstreamer-gen"
location=
"lib/gen-java"
/>
<property
name=
"packetstreamer-gen-build"
location=
"lib/gen-java-bin"
/>
<property
name=
"packetstreamer-thrift-jar"
value=
"packetstreamer-thrift.jar"
/>
<property
name=
"floodlight-jar"
location=
"${target}/floodlight.jar"
/>
<property
name=
"floodlight-nodeps-jar"
location=
"${target}/floodlight-nodeps.jar"
/>
<property
name=
"floodlight-debian-jar"
location=
"${target}/floodlight-debian.jar"
/>
<property
name=
"floodlight-jar"
location=
"${target}/floodlight.jar"
/>
<property
name=
"floodlight-test-jar"
location=
"${target}/floodlight-test.jar"
/>
<patternset
id=
"lib"
>
...
...
@@ -57,6 +58,15 @@
<include
name=
"jython-2.5.2.jar"
/>
<include
name=
"libthrift-0.7.0.jar"
/>
</patternset>
<!-- Dependencies we can't get from Debian/Ubuntu. -->
<patternset
id=
"debian-lib"
>
<include
name=
"org.restlet-2.1-RC1.jar"
/>
<include
name=
"org.restlet.ext.jackson-2.1-RC1.jar"
/>
<include
name=
"org.restlet.ext.simple-2.1-RC1.jar"
/>
<include
name=
"org.restlet.ext.slf4j-2.1-RC1.jar"
/>
<include
name=
"libthrift-0.7.0.jar"
/>
<include
name=
"simple-4.1.21.jar"
/>
</patternset>
<patternset
id=
"genlib"
>
<include
name=
"${packetstreamer-thrift-jar}"
/>
</patternset>
...
...
@@ -226,6 +236,17 @@
</zipgroupfileset>
<zipfileset
src=
"${floodlight-nodeps-jar}"
/>
</jar>
<jar
destfile=
"${floodlight-debian-jar}"
>
<manifest>
<attribute
name=
"Main-Class"
value=
"${main-class}"
/>
<!-- JARs under /usr/share/java on Debian/Ubuntu -->
<attribute
name=
"Class-Path"
value=
"args4j.jar slf4j-api.jar logback-core.jar logback-classic.jar jackson-core-asl.jar jackson-mapper-asl.jar easymock.jar netty.jar concurrentlinkedhashmap-lru.jar jython.jar antlr3-runtime.jar asm3.jar asm3-tree.jar ."
/>
</manifest>
<zipgroupfileset
dir=
"lib"
>
<patternset
refid=
"debian-lib"
/>
</zipgroupfileset>
<zipfileset
src=
"${floodlight-nodeps-jar}"
/>
</jar>
<jar
destfile=
"${floodlight-test-jar}"
filesetmanifest=
"mergewithoutmain"
>
<manifest>
<attribute
name=
"Class-Path"
value=
"."
/>
...
...
This diff is collapsed.
Click to expand it.
debian/floodlight.install
+
1
−
1
View file @
f6fa3ce3
target
/
floodlight
-
nodeps
.
jar
usr
/
share
/
java
target
/
floodlight
-
debian
.
jar
usr
/
share
/
java
debian
/
misc
/
floodlight
usr
/
bin
This diff is collapsed.
Click to expand it.
debian/misc/floodlight
+
1
−
1
View file @
f6fa3ce3
#!/bin/sh
exec
java
-jar
/usr/share/java/floodlight.jar
"
$@
"
exec
java
-jar
/usr/share/java/floodlight
-debian
.jar
"
$@
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment