summaryrefslogtreecommitdiff
blob: 179e5790cc366cfac24c93421c83e3c2f046d4ea (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
diff -Naur root.as-needed/Makefile root/Makefile
--- root.as-needed/Makefile	2011-07-10 10:42:49.758191296 +0400
+++ root/Makefile	2011-07-10 10:43:21.493339703 +0400
@@ -1167,10 +1167,7 @@
 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
 	   fi; \
-	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
-	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
-	   fi; \
-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
 	      dir=$(RFLX_GRFLXDD:lib/=); \
 	      while test "x$${dir}" != "x" && \
 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
--- root.as-needed/bindings/pyroot/Module.mk	2011-07-10 10:42:48.991561304 +0400
+++ root/bindings/pyroot/Module.mk	2011-07-10 10:43:21.493339703 +0400
@@ -48,8 +48,6 @@
 ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
 $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
 endif
-ROOTPYC      := $(ROOTPY:.py=.pyc)
-ROOTPYO      := $(ROOTPY:.py=.pyo)
 
 # used in the main Makefile
 ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
@@ -68,10 +66,8 @@
 include/%.h:    $(PYROOTDIRI)/%.h
 		cp $< $@
 
-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
 
-$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
+$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
                 $(ROOTLIBSDEP) $(PYTHONLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
@@ -113,7 +109,7 @@
 
 distclean-$(MODNAME): clean-$(MODNAME)
 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
+		   $(ROOTPY) $(PYROOTMAP) \
 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
 
 distclean::     distclean-$(MODNAME)
diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
--- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
+++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
@@ -691,10 +691,6 @@
 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
 		-X$(PREFIX)/include/root/Minuit2
 #		$(foreach i, \
diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
--- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
+++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
@@ -31,10 +31,6 @@
 CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
 $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
 endif
-ifneq ($(BUILDPYTHON),no)
-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
-endif
 
 # used in the main Makefile
 ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
@@ -86,8 +82,6 @@
 		fi)
 		cp $< $@
 
-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
 
 $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
--- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
+++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
@@ -48,9 +48,6 @@
 RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
 RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
 RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
-ifneq ($(BUILDPYTHON),no)
-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
-endif
 
 RFLX_LIBDIR = $(LIBDIR)
 
@@ -92,7 +89,7 @@
 
 ALLEXECS += $(RFLX_GENMAPX)
 
-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
+POSTBIN  += $(RFLX_GRFLXPY)
 
 ##### local rules #####
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
@@ -122,8 +119,6 @@
 		  mkdir -p lib/python/genreflex; fi )
 		cp $< $@
 
-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
-		@python -c 'import py_compile; py_compile.compile( "$<" )'
 
 $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
 
@@ -149,7 +144,7 @@
 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
 
-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
 
 clean-genreflex:
 		@rm -rf lib/python/genreflex
diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
--- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
+++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
@@ -15,7 +15,7 @@
 #####################   sources   ####################
 
 FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
 
 #####################  gccxmlpath ####################