projects
/
lui-solr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9099fa0
)
Remove solr 3. Use 0.3.x branch to generate new Solr 3 packages
author
Dennis Schafroth
<dennis@indexdata.com>
Wed, 3 Jul 2013 13:56:45 +0000
(15:56 +0200)
committer
Dennis Schafroth
<dennis@indexdata.com>
Wed, 3 Jul 2013 13:56:45 +0000
(15:56 +0200)
debian/rules
patch
|
blob
|
history
diff --git
a/debian/rules
b/debian/rules
index
5eb27c0
..
029f76e
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-1,80
+1,48
@@
#!/usr/bin/make -f
# debian/rules for alien
#!/usr/bin/make -f
# debian/rules for alien
-BASE=masterkey-lui-solr
+BASE=masterkey-lui-solr4
BASE_MASTER=$(BASE)-master
BASE_MASTER_TOMCAT=$(BASE_MASTER)-tomcat
BASE_SLAVE=$(BASE)-slave
BASE_SLAVE_TOMCAT=$(BASE_SLAVE)-tomcat
BASE_MASTER=$(BASE)-master
BASE_MASTER_TOMCAT=$(BASE_MASTER)-tomcat
BASE_SLAVE=$(BASE)-slave
BASE_SLAVE_TOMCAT=$(BASE_SLAVE)-tomcat
-BASE4=$(BASE)4
-BASE4_TOMCAT=$(BASE4)-tomcat
-BASE4_SLAVE=$(BASE4)-slave
-BASE4_SLAVE_TOMCAT=$(BASE4_SLAVE)-tomcat
-
DOC = /usr/share/doc/masterkey
LOG = /var/log/masterkey
DOC = /usr/share/doc/masterkey
LOG = /var/log/masterkey
-SHARE = /usr/share/masterkey/lui/solr
-SHARE4 = /usr/share/masterkey/lui/solr4
+SHARE = /usr/share/masterkey/lui/solr4
CONF_MASTER = $(SHARE)/master
CONF_SLAVE = $(SHARE)/slave
CONF_MASTER = $(SHARE)/master
CONF_SLAVE = $(SHARE)/slave
-CONF4_MASTER = $(SHARE4)/master
-CONF4_SLAVE = $(SHARE4)/slave
-
-DATA = /var/lib/masterkey/lui/solr
+DATA = /var/lib/masterkey/lui/solr4
DATA_MASTER = $(DATA)/master
DATA_SLAVE = $(DATA)/slave
DATA_MASTER = $(DATA)/master
DATA_SLAVE = $(DATA)/slave
-DATA4 = /var/lib/masterkey/lui/solr4
-DATA4_MASTER = $(DATA4)/master
-DATA4_SLAVE = $(DATA4)/slave
-
LUI_SOLR_COMMON = $(BASE)-common
LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON)
LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war
LUI_SOLR_COMMON = $(BASE)-common
LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON)
LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war
-LUI_SOLR4_COMMON = $(BASE4)-common
-LUI_SOLR4_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_COMMON)
-LUI_SOLR4_COMMON_DIR = $(LUI_SOLR4_COMMON_ROOT)$(SHARE)/war
-
LUI_SOLR_MASTER = $(BASE)-master
LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
LUI_SOLR_MASTER_SHARE_DIR = $(LUI_SOLR_MASTER_ROOT)$(CONF_MASTER)
LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)$(DATA_MASTER)
LUI_SOLR_MASTER = $(BASE)-master
LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
LUI_SOLR_MASTER_SHARE_DIR = $(LUI_SOLR_MASTER_ROOT)$(CONF_MASTER)
LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)$(DATA_MASTER)
-LUI_SOLR4_MASTER = $(BASE4)-master
-LUI_SOLR4_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_MASTER)
-LUI_SOLR4_MASTER_SHARE_DIR = $(LUI_SOLR4_MASTER_ROOT)$(CONF4_MASTER)
-LUI_SOLR4_MASTER_LIB_DIR = $(LUI_SOLR4_MASTER_ROOT)$(DATA4_MASTER)
-
+LUI_SOLR_COMMON_TOMCAT = $(LUI_SOLR_COMMON)-tomcat
+LUI_SOLR_COMMON_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT)
LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat
LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT)
LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat
LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT)
-LUI_SOLR4_MASTER_TOMCAT = $(LUI_SOLR4_MASTER)-tomcat
-LUI_SOLR4_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_MASTER_TOMCAT)
-
LUI_SOLR_SLAVE = $(BASE)-slave
LUI_SOLR_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR_SLAVE)
LUI_SOLR_SLAVE_SHARE_DIR = $(LUI_SOLR_SLAVE_ROOT)$(CONF_SLAVE)
LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE)
LUI_SOLR_SLAVE = $(BASE)-slave
LUI_SOLR_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR_SLAVE)
LUI_SOLR_SLAVE_SHARE_DIR = $(LUI_SOLR_SLAVE_ROOT)$(CONF_SLAVE)
LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE)
-LUI_SOLR4_SLAVE = $(BASE4)-slave
-LUI_SOLR4_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_SLAVE)
-LUI_SOLR4_SLAVE_SHARE_DIR = $(LUI_SOLR4_SLAVE_ROOT)$(CONF4_SLAVE)
-LUI_SOLR4_SLAVE_LIB_DIR = $(LUI_SOLR4_SLAVE_ROOT)$(DATA4_SLAVE)
-
LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat
LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat
LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
-LUI_SOLR4_SLAVE_TOMCAT = $(LUI_SOLR4_SLAVE)-tomcat
-LUI_SOLR4_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
-
-SOLR_VERSION=3.6.2
-SOLR4_VERSION=4.3.1
+SOLR_VERSION=4.3.1
PACKAGE=$(shell dh_listpackages)
PACKAGE=$(shell dh_listpackages)
@@
-97,10
+65,6
@@
install-stamp: build
mkdir -p $(LUI_SOLR_COMMON_DIR)
cp dist/apache-solr-$(SOLR_VERSION).war -d $(LUI_SOLR_COMMON_DIR)
mkdir -p $(LUI_SOLR_COMMON_DIR)
cp dist/apache-solr-$(SOLR_VERSION).war -d $(LUI_SOLR_COMMON_DIR)
- # lui-solr4-common. Install a Solr WAR.
- mkdir -p $(LUI_SOLR4_COMMON_DIR)
- cp dist/apache-solr-$(SOLR4_VERSION).war -d $(LUI_SOLR4_COMMON_DIR)
-
# lui-solr-master
mkdir -p $(LUI_SOLR_MASTER_SHARE_DIR)
cp -rp conf3 $(LUI_SOLR_MASTER_SHARE_DIR)
# lui-solr-master
mkdir -p $(LUI_SOLR_MASTER_SHARE_DIR)
cp -rp conf3 $(LUI_SOLR_MASTER_SHARE_DIR)
@@
-108,12
+72,6
@@
install-stamp: build
ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/conf/solrconfig.xml
mkdir -p $(LUI_SOLR_MASTER_LIB_DIR)
ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/conf/solrconfig.xml
mkdir -p $(LUI_SOLR_MASTER_LIB_DIR)
- # lui-solr4-master
- mkdir -p $(LUI_SOLR4_MASTER_SHARE_DIR)
- cp -rp conf $(LUI_SOLR4_MASTER_SHARE_DIR)
- ln -sf solrconfig-master.xml $(LUI_SOLR4_MASTER_SHARE_DIR)/conf/solrconfig.xml
- mkdir -p $(LUI_SOLR4_MASTER_LIB_DIR)
-
# lui-solr-slave Slave configuration
mkdir -p $(LUI_SOLR_SLAVE_SHARE_DIR)
cp -rp conf3 $(LUI_SOLR_SLAVE_SHARE_DIR)
# lui-solr-slave Slave configuration
mkdir -p $(LUI_SOLR_SLAVE_SHARE_DIR)
cp -rp conf3 $(LUI_SOLR_SLAVE_SHARE_DIR)
@@
-121,28
+79,19
@@
install-stamp: build
ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml
mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)
ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml
mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)
- # lui-solr4-slave Slave configuration
- mkdir -p $(LUI_SOLR4_SLAVE_SHARE_DIR)
- cp -rp conf $(LUI_SOLR4_SLAVE_SHARE_DIR)
- ln -sf solrconfig4-slave.xml $(LUI_SOLR4_SLAVE_SHARE_DIR)/conf/solrconfig.xml
- mkdir -p $(LUI_SOLR4_SLAVE_LIB_DIR)
+ # Common lui-solr4-tomcat: Logging Libraries installed under tomcat6.
+ # Harvester Utilities. Stylesheet used in includes needs to be in CATALINA_HOME
+ mkdir -p $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib
+ cp -r lib/ $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib
# lui-solr-master plumbing for Tomcat 6.
mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui
cp etc/solr-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr-master.xml
# lui-solr-master plumbing for Tomcat 6.
mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui
cp etc/solr-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr-master.xml
- # lui-solr4-master plumbing for Tomcat 6.
- mkdir -p $(LUI_SOLR4_MASTER_ROOT)/etc/masterkey/lui
- cp etc/solr4-tomcat-context-master.xml $(LUI_SOLR4_MASTER_ROOT)/etc/masterkey/lui/lui-solr4-master.xml
-
# lui-solr-slave plumbing for Tomcat 6
mkdir -p $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui
cp etc/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr-slave.xml
# lui-solr-slave plumbing for Tomcat 6
mkdir -p $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui
cp etc/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr-slave.xml
- # lui-solr4-slave plumbing for Tomcat 6
- mkdir -p $(LUI_SOLR4_SLAVE_ROOT)/etc/masterkey/lui
- cp etc/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
-
touch $@
binary: build install
touch $@
binary: build install