Adjust CMake build for new 3.12/ directory layouts

Summary: Title says it all.

Differential Revision: D78364964

fbshipit-source-id: 8ff6837cdcb5c0f19363fed9eba074173d423299

Author: alexmalyshev

CMakeLists.txt

@@ -239,12 +239,12 @@ target_link_libraries(cached-properties PRIVATE common borrowed)
 set(INTERP_SOURCES ${PROJECT_SOURCE_DIR}/Interpreter/iter_helpers.c)
 
 if (${PY_VERSION} EQUAL 3.12)
-  set(SOURCE_CINDERX_OPCODE_TARGETS_H ${PROJECT_SOURCE_DIR}/Interpreter/cinderx_opcode_targets_312.h)
-  set(SOURCE_CINDER_OPCODE_H ${PROJECT_SOURCE_DIR}/Interpreter/cinder_opcode_312.h)
-  set(SOURCE_OPCODE_H ${PROJECT_SOURCE_DIR}/Interpreter/opcode_312.h)
+  set(SOURCE_CINDERX_OPCODE_TARGETS_H ${PROJECT_SOURCE_DIR}/Interpreter/3.12/cinderx_opcode_targets.h)
+  set(SOURCE_CINDER_OPCODE_H ${PROJECT_SOURCE_DIR}/Interpreter/3.12/cinder_opcode.h)
+  set(SOURCE_OPCODE_H ${PROJECT_SOURCE_DIR}/Interpreter/3.12/opcode.h)
 
   if (${META_PYTHON})
-    set(INTERP_SOURCES ${INTERP_SOURCES} ${PROJECT_SOURCE_DIR}/Interpreter/interpreter-3.12.c)
+    set(INTERP_SOURCES ${INTERP_SOURCES} ${PROJECT_SOURCE_DIR}/Interpreter/3.12/interpreter.c)
   endif()
 endif()
 

setup.py

@@ -40,9 +40,11 @@ class BuildPy(build_py):
     def run(self) -> None:
         super().run()
 
-        # Copy opcodes/opcode_312.py to cinderx/opcode.py.
+        # Copy opcodes/3.12/opcode.py to cinderx/opcode.py.
         out_path = self.get_module_outfile(self.build_lib, ["cinderx"], "opcode")
-        self.copy_file("PythonLib/opcodes/opcode_312.py", out_path, preserve_mode=False)
+        self.copy_file(
+            "PythonLib/opcodes/3.12/opcode.py", out_path, preserve_mode=False
+        )
 
 
 class CMakeExtension(Extension):